Commit graph

7 commits

Author SHA1 Message Date
Techlone
541144f443 formatting 2017-06-07 18:19:50 +05:00
Techlone
86318b7b44 Merge branch 'unstable' into advminer2_improvements
# Conflicts:
#	src/main/java/gregtech/api/gui/GT_GUIContainer_MultiMachine.java
2017-06-07 18:17:23 +05:00
Blood-Asp
c1f85264a0 Add missing translation lines. #772 2017-06-05 20:45:15 +02:00
Techlone
c5402ee389 Some ODP fixes, energy checking, add radius in tooltip, add "missing pipes" message for II-IV tiers
change build.gradle for debugging in IDEA
2017-06-02 22:18:29 +05:00
Blood-Asp
00d19d70be Turbines and Oil Drilling rig now show missing items in GUI 2016-10-19 21:57:53 +02:00
Shawn Buckley
9353aa711b Reformat code 2015-10-21 22:06:25 -04:00
Shawn Buckley
1185424fa7 Move source files 2015-10-21 20:46:52 -04:00
Renamed from main/java/gregtech/api/gui/GT_GUIContainer_MultiMachine.java (Browse further)