Sangui/GT5-Unofficial
2
1
Fork 0
Code Issues 6 Pull requests Projects Releases Packages Wiki Activity Actions
GT5-Unofficial/src/main/java/gregtech
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
..
api Merge remote-tracking branch 'origin/unstable' into 2017-08-19 14:24:52 +02:00
common Merge remote-tracking branch 'origin/unstable' into 2017-08-19 14:24:52 +02:00
loaders Merge remote-tracking branch 'origin/unstable' into 2017-08-19 14:24:52 +02:00
nei Old chemical recipes are now enabled by default, marked as deprecated 2017-08-19 10:43:07 +02:00
GT_Mod.java Merge remote-tracking branch 'origin/unstable' into 2017-08-19 14:24:52 +02:00