Commit graph

619 commits

Author SHA1 Message Date
modmuss50
74e16510aa added isActive to the crafter 2015-05-21 21:27:16 +01:00
modmuss50
9eb7735c10 Added comments to the crafter to help people understand it 2015-05-21 07:56:01 +01:00
Gig
7b1b131b23 Little things 2015-05-21 00:42:44 +01:00
Gig
1446237236 Merge branch 'master' of https://github.com/TechReborn/TechReborn 2015-05-20 23:35:18 +01:00
Gig
4ffa445b9b Fixed Lathe returning on texture all the time 2015-05-20 23:35:04 +01:00
Tntrololol
2278e2ab3e Added GUI progress bar to the Chemical Reactor 2015-05-20 17:34:41 -05:00
Tntrololol
f32c81c780 Merge remote-tracking branch 'origin/master' 2015-05-20 16:44:06 -05:00
Tntrololol
4bd43b861c Added GUI progress bar to the Industrial Centrifuge 2015-05-20 16:43:46 -05:00
Gig
105c83b288 Fixed Conflicting Tiles Closes issue #7 2015-05-20 17:00:58 +01:00
Gig
1f93e6a90e Fixed centrifuge returning alloy smelter 2015-05-19 23:07:20 +01:00
Gig
cfaabab37a Moved recipe handlers to Api 2015-05-19 23:06:52 +01:00
Gig
1f9600b33c Organized imports
Changed centrifuge to new recipe system
2015-05-19 23:00:36 +01:00
Tntrololol
6de2cc351a Added plate cutting machine recipes 2015-05-18 18:05:49 -05:00
Tntrololol
942c41fe14 Added electric lathe recipes 2015-05-18 17:12:11 -05:00
Tntrololol
701b6553b6 Merge remote-tracking branch 'origin/master' 2015-05-17 19:57:34 -05:00
Tntrololol
2007161a16 Added remaining assembling machine recipes 2015-05-17 19:56:52 -05:00
Gig
20a9cabf93 Little clean and format change 2015-05-17 22:58:53 +01:00
Gig
ce4312a578 Upgrade slots for more machines 2015-05-17 19:45:12 +01:00
Gig
ca98541d70 Start on hammer 2015-05-17 02:16:40 +01:00
Gig
cfc71d48b2 Added machine block for stand alone recipes 2015-05-17 01:37:03 +01:00
Tntrololol
3b5f80bf77 Merge remote-tracking branch 'origin/master' 2015-05-16 18:52:15 -05:00
Tntrololol
71e20d4dac Added some assembing machine recipes (not done yet) 2015-05-16 18:52:05 -05:00
Gig
0970604d5b Added waila support to more machine 2015-05-17 00:44:46 +01:00
Gig
9bc9da2fad Fixed ItemIcons on machines 2015-05-16 23:14:17 +01:00
Gig
2163092237 added On textures to a load of machines 2015-05-16 22:50:11 +01:00
modmuss50
3a89b0446c Added on texture to implosion compressor 2015-05-16 22:30:45 +01:00
modmuss50
1726d4c7a3 Fixed drainContainers not checking to see if it can fill 2015-05-16 21:55:27 +01:00
modmuss50
44a21fd13d Fixed some things 2015-05-16 21:30:20 +01:00
modmuss50
d68c63a40d Added fluid crafting, updated buildcraft 2015-05-16 20:30:07 +01:00
modmuss50
fd2f5d193a added onCraft, and canCraft 2015-05-16 19:40:39 +01:00
modmuss50
9b654eb1de Fixed stack size 2015-05-16 19:26:26 +01:00
modmuss50
1b308c56d6 Revert "Merge remote-tracking branch 'origin/loadingScreen'"
This reverts commit 5e20dc8156, reversing
changes made to 3e5fc0bbec.
2015-05-16 17:45:42 +01:00
modmuss50
5e20dc8156 Merge remote-tracking branch 'origin/loadingScreen'
Conflicts:
	src/main/java/techreborn/Core.java
2015-05-16 17:44:08 +01:00
modmuss50
3e5fc0bbec Massive network performance inprovement. 2015-05-16 17:33:50 +01:00
modmuss50
d32b39d8c6 Machines no longer require an input in the set slot 2015-05-16 17:23:39 +01:00
modmuss50
f7124cb7e6 fixed syncing things, and bug with last commit 2015-05-16 16:59:36 +01:00
modmuss50
6bd2818e74 fixed input stack size 2015-05-16 16:55:54 +01:00
modmuss50
b2fcb98003 removed . 2015-05-16 13:17:24 +01:00
modmuss50
1e969ff6cf added ee3 to build script 2015-05-16 13:13:09 +01:00
Gig
f9074e5b37 Added battery and upgrade slots to chemical reactor 2015-05-15 17:46:03 +01:00
Gig
83259b0615 Fixed Chemical Reactor gui name 2015-05-15 17:37:33 +01:00
Gig
44abbfd79f Added missing uurecipes 2015-05-15 17:29:12 +01:00
Gig
fc11db09cc Added bucket textures to items 2015-05-15 17:05:18 +01:00
Gig
2b652f0502 I should remember when I update forge to run gradlew eclipse 2015-05-15 16:52:16 +01:00
Gig
ceeda641a6 Commented out all doesOreNameExist recipes 2015-05-15 16:45:27 +01:00
Gig
f1fd0af052 Now checks for ee3 2015-05-15 16:27:40 +01:00
Tntrololol
3c0bd5a54f Added remaining alloy smelter recipes 2015-05-14 22:19:52 -05:00
Tntrololol
158fdd338a Fixed custom macerator recipes showing up as fire in NEI if ores were not present. 2015-05-14 16:03:19 -05:00
Tntrololol
24180fd5b1 Merge remote-tracking branch 'origin/master' 2015-05-13 17:32:03 -05:00
Tntrololol
fdec643bbb Added bucket textures 2015-05-13 17:31:48 -05:00