Sangui/GT5-Unofficial
2
1
Fork 0
Code Issues 6 Pull requests Projects Releases Packages Wiki Activity Actions
GT5-Unofficial/src/main/java/gregtech/api
History
Johannes Gäßler f698d3f8e0 Merge branch 'BrickedBlastFurnace' into unstable 
Conflicts:
	src/main/java/gregtech/GT_Mod.java
	src/main/java/gregtech/api/enums/Materials.java
	src/main/java/gregtech/common/GT_Proxy.java
	src/main/java/gregtech/common/blocks/GT_Block_Casings4.java
	src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java
	src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java
2017-06-25 23:45:45 +02:00
..
damagesources Reformat code 2015-10-21 22:06:25 -04:00
enchants Reformat code 2015-10-21 22:06:25 -04:00
enums Merge branch 'BrickedBlastFurnace' into unstable 2017-06-25 23:45:45 +02:00
events Reformat code 2015-10-21 22:06:25 -04:00
gui formatting 2017-06-07 18:19:50 +05:00
interfaces Merge branch 'BrickedBlastFurnace' into unstable 2017-06-25 23:45:45 +02:00
items fix for timber changes 2017-06-14 01:30:36 +02:00
metatileentity Merge remote-tracking branch 'origin/unstable' into OilRefining 2017-06-18 17:26:04 +02:00
net pollution smog 2017-06-14 23:51:39 +02:00
objects Fixed several Material formulas 2017-06-23 00:54:16 +02:00
threads Remove null checks 2016-08-13 09:10:38 +01:00
util Merge branch 'BrickedBlastFurnace' into unstable 2017-06-25 23:45:45 +02:00
world HashMap > ConcurrentHashMap & String vars 2016-08-13 08:28:24 +01:00
GregTech_API.java Moved the Casings for the Large Chemical Reactor again. 2017-06-22 01:50:21 +02:00