Commit graph

3937 commits

Author SHA1 Message Date
Modmuss50
fcf33289de Merge pull request #13 from Mazdallier/patch-1
Create fr_FR.lang
2015-05-26 17:05:23 +01:00
Yves
54677cad5e Create fr_FR.lang 2015-05-26 14:54:49 +02:00
Tntrololol
e62ba4d440 Fixed crash with cross mod grinder recipes 2015-05-25 23:26:54 -05:00
Tntrololol
a5691aff9a Fix recipe conflict with Mekanism 2015-05-25 22:21:12 -05:00
Tntrololol
10b13d9adc Added Industrial Grinder Recipes 2015-05-25 21:17:59 -05:00
Tntrololol
37ba159fa1 Fixed storage block ore dictionary registrations 2015-05-25 12:37:51 -05:00
Tntrololol
ade8f68acb Added Metal Former Recipes 2015-05-25 12:10:20 -05:00
Tntrololol
fceb417fe2 Added Industrial Centrifuge Recipes 2015-05-25 00:20:59 -05:00
Tntrololol
0bb98b1781 Enabled Grinder to take an extra input in place of fluidstack 2015-05-24 13:51:41 -05:00
modmuss50
2d17902d03 Allow any input or output to be null, includes a fix for the grinder fluid as well 2015-05-23 13:54:12 +01:00
modmuss50
46ee2fc71d Initial fix to allow null itemstacks 2015-05-23 13:47:25 +01:00
Tntrololol
56e41efd6b Merge remote-tracking branch 'origin/master' 2015-05-22 17:37:26 -05:00
Tntrololol
7ad96faa21 Added new storage blocks and textures 2015-05-22 17:37:10 -05:00
modmuss50
e4c5b1a0da Merge branch 'master' of https://github.com/TechReborn/TechReborn 2015-05-22 21:15:29 +01:00
modmuss50
0298621cb9 More work on the syncing issues, should be all fixed :) 2015-05-22 21:15:19 +01:00
Tntrololol
e9b1280a13 Added 5 additional types of machine hulls and their respective textures 2015-05-22 15:02:02 -05:00
modmuss50
e930ea2a04 Added a central way of limiting the syncs.
Tiles auto sync every 30 seconds
they have a max so they can only sync 2 times a second
2015-05-22 08:22:16 +01:00
Tntrololol
cdf8f3e0a3 Added GUI elements to the Industrial Grinder 2015-05-21 18:04:34 -05:00
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