Commit graph

839 commits

Author SHA1 Message Date
Blood-Asp
6217cca671 Return slabs on paper crafting and add metal subtags to TungstenCarbine, VanadiumSteel, ect 2016-09-23 19:42:42 +02:00
Muramasa
ec9bd39c02 Fix missing code block 2016-09-23 14:16:53 +01:00
Dragon2488
457fb3a4ad Oregen sync fix 2016-09-23 17:14:43 +07:00
Muramasa
291839871e Reduce disabled component creation & GT_Proxy postInit -> Processors 2016-09-23 02:28:29 +01:00
Dragon2488
5509d94044 oregen lag fix 2016-09-22 22:00:27 +07:00
Muramasa-
8f2e13681b Merge pull request #632 from Muramasa-/Bugfixes
Various Bugfixes
2016-09-20 17:03:18 +01:00
Dragon2488
dda2aa95a2 Bump GT version, temporary oregen lag fix. 2016-09-18 14:56:20 +07:00
Dragon2488
82dab9d1bd JEI recipes overlapping fix. 2016-09-18 13:04:39 +07:00
Dragon2488
d94f16ea07 Pipes and cables rendering 2016-09-18 00:02:46 +07:00
Muramasa
a03fc7fc1d That didn't work 2016-09-17 13:27:03 +01:00
Muramasa
769362d60b Reduce Marble/Basalt harvest level and setOreBlock fixes 2016-09-16 15:42:27 +01:00
Muramasa
23546a5c2c Stop disabled component recipe gen, more separation and fixes 2016-09-16 15:01:37 +01:00
Muramasa
312141cd10 Fix it again 2016-09-16 12:17:19 +01:00
Muramasa
491925bc59 Merge remote-tracking branch 'refs/remotes/Blood-Asp/experimental' into Exp 2016-09-16 12:06:01 +01:00
Muramasa
e981c0db30 One more conflict 2016-09-16 00:27:47 +01:00
Muramasa
6ac01a92c9 Fix conflicts 2016-09-16 00:17:08 +01:00
Blood-Asp
0e60389c41 Fix Tools and lag on reading tooltip 2016-09-15 22:02:18 +02:00
Dragon2488
a5d2eaffa3 Oops (x2) 2016-09-16 00:39:19 +07:00
Muramasa
b22bb2dfa6 Update Part 1 2016-09-15 15:48:47 +01:00
Muramasa
b10acf8244 Merge remote-tracking branch 'refs/remotes/Blood-Asp/experimental' into Exp 2016-09-15 15:40:06 +01:00
Blood-Asp
c997df5952 Add Magneticraft compat
and remove Thaumcraft changes because of bugs/no improvements
And add config to arc smelt not annealed/wought.
2016-09-15 16:36:08 +02:00
Dragon2488
0080b1a69b Fixed run on dedicated server. 2016-09-15 21:24:35 +07:00
Dragon2488
d490759e8d Lightning fix, black blocks on break attempt fix 2016-09-15 18:28:52 +07:00
Muramasa
1c195f5aab Merge branch 'refs/heads/Blood-Asp/experimental' into Bugfixes 2016-09-13 23:40:50 +01:00
Muramasa-
059cf34455 Merge pull request #631 from Muramasa-/LoadTimes
Various Load Time Improvements
2016-09-13 21:09:38 +01:00
Dragon2488
7f1791abbf Lightning fix, black blocks on break attempt fix 2016-09-13 17:15:07 +07:00
Blood-Asp
4091b39401 Merge branch 'experimental' of https://github.com/Blood-Asp/GT5-Unofficial into experimental 2016-09-13 00:29:46 +02:00
Blood-Asp
a7c0bd518b Gave away new bock ids. 2016-09-13 00:29:43 +02:00
Dragon2488
235b6310f8 Rewrite gregtech.asm to clean ASM and removed javassist 2016-09-12 22:27:35 +07:00
Dragon2488
461c02e69f ASM fixes. 2016-09-12 21:29:10 +07:00
Dragon2488
d9aa2535e6 JEI support, build.gradle update 2016-09-12 18:07:17 +07:00
Muramasa
75ef60a0c1 Add processing changes from LoadTimes/Bugfixes and more cleanup 2016-09-10 15:00:07 +01:00
Muramasa
33e6060119 Simplify, cleanup and seperate processors 2016-09-10 13:20:09 +01:00
Dragon2488
41276f206a Port: Part 4. Block rendering, machines, ASM, tools, items fixes & much more. 2016-09-09 21:51:35 +07:00
Muramasa
f53fb2b84b Bugfixes and now using built in OrePrefixes enabled/disabled lists 2016-09-09 14:25:59 +01:00
Dragon2488
b25e7eaf12 Port. Part 4: Fuck Mojangs. I can't make these fucking blocks have custom IBakedModel. It just doesn't work. Fuck mojangs. Project is frozen. Bye. 2016-09-06 16:53:20 +07:00
Blood-Asp
317a88b44a Merge pull request #620 from Technus/patch-1
Fixing efficiency calculation operator precedence.
2016-09-03 12:28:14 +02:00
Daniel
735f76c649 Update GT_MetaTileEntity_LargeTurbine.java 2016-09-03 12:18:17 +02:00
Daniel
b25332780a Update GT_MetaTileEntity_LargeTurbine_Steam.java 2016-09-03 12:16:06 +02:00
Daniel
90b1f5b910 Update GT_MetaTileEntity_LargeTurbine_Plasma.java 2016-09-03 12:15:34 +02:00
Daniel
568aca1804 Update GT_MetaTileEntity_LargeTurbine_HPSteam.java 2016-09-03 12:15:19 +02:00
Daniel
c52ff67fd6 Update GT_MetaTileEntity_LargeTurbine_Gas.java 2016-09-03 12:15:02 +02:00
Daniel
734a290302 Update GT_MetaTileEntity_LargeTurbine.java 2016-09-03 12:09:49 +02:00
Daniel
0c3a42aa7d Update GT_MetaTileEntity_LargeTurbine.java 2016-09-03 11:56:53 +02:00
Daniel
9b3d7149cf Update GT_MetaTileEntity_LargeTurbine_Plasma.java 2016-09-03 11:50:05 +02:00
Daniel
4c60c1e41e Update GT_MetaTileEntity_LargeTurbine_Gas.java 2016-09-03 11:49:18 +02:00
Daniel
408a07ef24 Update GT_MetaTileEntity_LargeTurbine_HPSteam.java 2016-09-03 11:42:53 +02:00
Blood-Asp
b4049e88a2 Port GT6 TC load time improvements 2016-08-31 14:22:00 +02:00
Muramasa
ac013d92c7 Actually, probably better to just exclude these 2016-08-31 04:57:16 +01:00
Muramasa
adca5141f9 fix issue with chest loot on server start 2016-08-31 04:47:54 +01:00