upstream/Mekanism-Community-Edition
1
0 Fork 0
mirror of https://github.com/Thorfusion/Mekanism-Community-Edition.git synced 2026-11-14 01:04:11 +00:00
Code Issues Packages Projects Releases Wiki Activity
Files
f0ad905c07e77fdffce3162628da5c1311adff3f
Mekanism-Community-Edition/src/main/java
T
History
Ben Spiers f0ad905c07 Merge branch '1.7.10' into development 
Conflicts:
	build.properties
	src/main/java/mekanism/common/Mekanism.java
	src/main/java/mekanism/common/voice/VoiceConnection.java
2014-07-07 15:43:53 +01:00
..
codechicken/core/launch
Major 1.7 work, down to a little more than 500 errors
2014-05-29 17:55:47 +01:00
mekanism
Merge branch '1.7.10' into development
2014-07-07 15:43:53 +01:00