Commit graph

1348 commits

Author SHA1 Message Date
modmuss50
07c9ee97d4 Added test recipe for blast furnace 2015-07-25 15:32:20 +01:00
modmuss50
aff8c26c49 Fixes energy gui scaling 2015-07-25 15:16:22 +01:00
modmuss50
466f50b232 fixes #44 2015-07-25 15:13:52 +01:00
gigabit101
fb3855a078 closes #87 2015-07-24 23:18:30 +01:00
gigabit101
2d16b194e8 this might have been a issue at some point 2015-07-24 22:30:23 +01:00
gigabit101
bac2cdcbc6 closes #55 2015-07-24 22:29:00 +01:00
gigabit101
5636dc373f closes #79 2015-07-24 21:54:18 +01:00
modmuss50
36ecb9c3f3 Merge branch 'master' of https://github.com/TechReborn/TechReborn 2015-07-23 16:57:21 +01:00
modmuss50
ef11f111ed Started work on a way to find duplicate items 2015-07-23 16:57:06 +01:00
Modmuss50
e1b0c7af06 Merge pull request #86 from Mazdallier/patch-1
Update fr_FR.lang
2015-07-23 16:19:37 +01:00
modmuss50
8725c5932d It now gets to the main menu without ic2 :) o/ Next I need to fix the powered items. 2015-07-23 16:19:07 +01:00
Mazdallier
c1643152a9 Update fr_FR.lang 2015-07-23 16:38:02 +02:00
modmuss50
496151fcae Fixed aesu powers in creative tab, more work moving away from ic2 core and only needing ic2 api 2015-07-23 13:42:20 +01:00
modmuss50
277e5e5e45 Fix incorrect EU-RF conversion 2015-07-23 13:07:20 +01:00
modmuss50
e9ece63a99 Initial untested port to new internal power system.
This resets all the machines internal power buffer
2015-07-23 12:52:51 +01:00
modmuss50
984b502ded fixes #85 , Fixes issues with RF output 2015-07-23 10:13:37 +01:00
modmuss50
62e5ccddd0 Merge branch 'master' of https://github.com/TechReborn/TechReborn 2015-07-23 09:38:28 +01:00
modmuss50
79235f15ba Fixed gui's changing colour while in f3 2015-07-23 09:38:08 +01:00
modmuss50
bb98d76eea Fixed incorrect storage block recipes 2015-07-23 09:30:38 +01:00
gigabit101
ab72f7dced Started adding progress bars to other machines 2015-07-21 17:53:43 +01:00
gigabit101
0880ffac72 Added configs to Aesu 2015-07-21 17:53:20 +01:00
gigabit101
f96e55737f fixed charge hud showing when disabled closes #84 2015-07-21 14:49:05 +01:00
modmuss50
663b5f2f75 Fixed some issues with the Industrial Electrolyzer 2015-07-20 15:38:36 +01:00
modmuss50
462aa20710 Fixed the BlastFurnace 2015-07-20 15:19:23 +01:00
modmuss50
29398d50dd Added Farm inventory cable 2015-07-14 17:18:00 +01:00
modmuss50
b6807d249d Some major tweaks to the part system, broken old cables! 2015-07-14 16:45:45 +01:00
modmuss50
d2b2f34d64 Some tweaks to the farm 2015-07-13 21:31:11 +01:00
modmuss50
fadba8db41 Even more work on the farm 2015-07-13 21:21:30 +01:00
modmuss50
5d574e0540 Some more work on the tree farm 2015-07-13 20:54:32 +01:00
modmuss50
ef5d81d8e2 Some more work on the farm 2015-07-13 16:24:50 +01:00
modmuss50
c160abf176 Started work on the farm, some changes to the idsu, its still broken 2015-07-13 13:54:44 +01:00
modmuss50
be33bdc148 Fixes #80 2015-07-12 16:51:14 +01:00
modmuss50
1a3cd0c54e fixes #78 2015-07-11 18:19:08 +01:00
modmuss50
a48dab6dfa Fixed ruby to steel 2015-07-11 18:12:06 +01:00
modmuss50
ffe92a7f90 ReAdded api jar file 2015-07-11 15:47:56 +01:00
modmuss50
8326a02237 START OF ALPHA 2
Also fixed a small issue
2015-07-10 23:27:42 +01:00
modmuss50
4e1d40a326 bump fast build 2015-07-10 23:18:58 +01:00
modmuss50
9d18e23404 update FastBuild to fix meta inf crash 2015-07-10 14:15:37 +01:00
modmuss50
0bcc13ae1e Fixed improper json formatting 2015-07-10 13:40:58 +01:00
modmuss50
b81fc6e8a4 Merge branch 'master' of https://github.com/TechReborn/TechReborn 2015-07-10 13:34:13 +01:00
modmuss50
6463d1816d Added back coreMod support with FastBuild, Updated FastBuild 2015-07-10 13:33:57 +01:00
Modmuss50
48a62da636 Merge pull request #76 from Mazdallier/patch-1
Update fr_FR.lang
2015-07-08 14:24:32 +01:00
Mazdallier
e4cfa69ba1 Update fr_FR.lang
config update
2015-07-08 14:08:56 +02:00
modmuss50
4a77476d6b Fixed fastBuild in jenkins 2015-07-08 11:35:58 +01:00
modmuss50
2560afe3d6 Set fast build to use the correct version of forge 2015-07-08 11:27:29 +01:00
modmuss50
bd7d559b4c New version of FastBuild 2015-07-08 11:20:16 +01:00
modmuss50
6f8226ffbb Added first testing version of FastBuild 2015-07-08 11:02:55 +01:00
modmuss50
fdc23c5ae9 Added support for EE3-Compataibilty 2015-07-06 20:33:50 +01:00
gigabit101
91c9a28796 Removed ruby to ruby dust recipe close #69 2015-07-06 16:52:12 +01:00
gigabit101
a07af2d70d moved battery slot on Centrifuge to correct position 2015-07-06 16:49:11 +01:00