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 af8860be2f Merge remote-tracking branch 'origin/unstable' into 
CircuitChemistryUpdateFollowup

Conflicts:
	src/main/java/gregtech/api/enums/Materials.java
	src/main/java/gregtech/common/GT_RecipeAdder.java
	src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java
2017-08-19 14:24:52 +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 remote-tracking branch 'origin/unstable' into 2017-08-19 14:24:52 +02:00
events Reformat code 2015-10-21 22:06:25 -04:00
gui Update GT_GUIContainer_1by1.java 2017-06-30 06:11:42 +08:00
interfaces Old chemical recipes are now enabled by default, marked as deprecated 2017-08-19 10:43:07 +02:00
items Optimize imports - intelliJ one button action 2017-06-25 12:09:46 +02:00
metatileentity Reverted the changes to basic machine processing. 2017-08-13 09:08:24 +02:00
net Optimize imports - intelliJ one button action 2017-06-25 12:09:46 +02:00
objects Optimize imports - intelliJ one button action 2017-06-25 12:09:46 +02:00
threads Remove null checks 2016-08-13 09:10:38 +01:00
util Merge remote-tracking branch 'origin/unstable' into 2017-08-19 14:24:52 +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