Commit graph

455 commits

Author SHA1 Message Date
Blood-Asp
8a17c67442 Turn off AdvMinerII and OilDrill once work is done. 2016-11-02 23:14:40 +01:00
Blood-Asp
395888a884 Modular Armor configs 2016-11-02 22:14:18 +01:00
Blood-Asp
a60428ab53 Fix ignored oredict names list not working 2016-11-01 13:18:44 +01:00
Blood-Asp
814dc25690 Modular Armor changes 1 2016-10-30 22:39:40 +01:00
Blood-Asp
11130dd435 More Translation stuff. Hope it does not lag. 2016-10-26 21:57:20 +02:00
Blood-Asp
f806a7b76d Fix super fuel not increasing efficiency 2016-10-26 21:02:15 +02:00
Blood-Asp
16f03e76e8 Allow max 1 crafting sound every 10 ticks to prevent rare crashes. 2016-10-26 20:34:04 +02:00
Blood-Asp
8c1550e5c2 Improve harvest range of sense to 5x5x5(now working) 2016-10-26 18:59:10 +02:00
Blood-Asp
4a8a0ab576 Fluid Regulator code optimization 2016-10-26 17:08:28 +02:00
Blood-Asp
2d5c40ef8f some bugfixes 2016-10-26 00:57:33 +02:00
Blood-Asp
7926877ed1 Pollution Update/Rebalance 2016-10-25 20:22:56 +02:00
Dragon2488
ebad9b80dd Harvest Level fix 2016-10-25 13:13:00 +07:00
Dragon2488
87b033b319 Server side crash fix. 2016-10-24 00:31:45 +07:00
Dragon2488
484a9e7640 Rendering overhaul & ores overhaul 2016-10-23 16:59:59 +07:00
Blood-Asp
f8408d6a9b quick fixes 2016-10-22 23:51:28 +02:00
Blood-Asp
8ef12119e0 Added new mode to only check large turbine rotors with need maintainance cover 2016-10-22 17:28:03 +02:00
Blood-Asp
15eb43998a Remove debug code 2016-10-22 16:42:30 +02:00
Blood-Asp
f12ae9a63f Add Naquadah fuel rods and fix some Assemblyline recipes
Naquadah fuel = Mox with 10x runtime.
2016-10-22 16:38:18 +02:00
Blood-Asp
e2ee26e55e Fix some recipes not working in processing array 2016-10-22 14:01:59 +02:00
Blood-Asp
dc56e5ef44 Immersive Engineering compatibility and more fuels in generators 2016-10-22 13:04:50 +02:00
Blood-Asp
49ff6ffa31 Wrench shift click can move machine front direction 2016-10-21 20:12:23 +02:00
Blood-Asp
187a49f43c Some Block fixes 2016-10-19 22:27:27 +02:00
Blood-Asp
f580712f18 Allow Oil Drills to pump oil in void worlds without bedrock 2016-10-19 18:41:29 +02:00
Blood-Asp
fdafabf291 Make Dough by throwing flour into filled cauldron 2016-10-19 18:31:17 +02:00
Blood-Asp
a70ce1a67b Cleanup recipe classes 2016-10-19 13:37:36 +02:00
Blood-Asp
4384688c07 Fix Compressed Aluminium issues. Making of Compressed plates and use in heavy duty alloy ingots. 2016-10-18 18:49:48 +02:00
Blood-Asp
637f704235 Make Disassemblers >Insane Voltage disassemble faster without efficency loss. 2016-10-17 00:09:07 +02:00
Blood-Asp
52d40e14bc Fix recipes for forestry wood covers. 2016-10-16 20:41:49 +02:00
Blood-Asp
fa79dcd263 Base IC2 Classic compat. Reactor components disabled, some recipes likely missing/broken 2016-10-16 18:08:26 +02:00
Dimach
f037d652a7 Added forming press support for processing arrays. 2016-10-13 23:26:03 +02:00
Blood-Asp
c240b431f8 Fixed charcoal pile igniter bug 2016-10-13 22:48:08 +02:00
Blood-Asp
a006b76304 Drop Items from Exploding GT Machines + Config 2016-10-13 22:26:14 +02:00
Muramasa
ce632479bc Hide some unused blocks in NEI 2016-10-13 18:52:21 +01:00
Muramasa
e16b037cb7 Add config to enable all disabled mats & components. 2016-10-13 18:51:14 +01:00
Blood-Asp
021ed41721 Update Multiblock Tooltips 2016-10-13 17:46:05 +02:00
Muramasa
66ab344159 Fix VALUES & Replicator recipes 2016-10-13 16:43:06 +01:00
Blood-Asp
d4c23ed7a7 Show nuggets by default in NEI 2016-10-13 13:49:52 +02:00
Blood-Asp
1c8fcb89ec Fixing Heavy Duty Alloy Ingot recipes 2016-10-10 18:42:37 +02:00
Blood-Asp
1b78b56388 Alloy energy hatch in every slice of the assembly line 2016-10-09 00:13:49 +02:00
Dimach
104bcf62d8 Fixed fluid regulator. 2016-10-08 20:17:03 +02:00
Muramasa
79f0947172 Pull exp changes 2016-10-07 16:50:34 +01:00
Muramasa
b88e197530 Fix GT Crop extraction recipes & Seperate Comb&Crop nerf config option 2016-10-07 16:44:21 +01:00
Blood-Asp
c27399b512 Move load order for doors to fix malisis doors conflict. 2016-10-07 17:36:21 +02:00
Blood-Asp
db7db8e4a0 Revert unwanted Heating Capacity behavior change. 2016-10-07 12:04:58 +02:00
Muramasa
d2efd7ae54 Small fixes 2016-10-04 04:32:51 +01:00
Muramasa
173700a611 Computronics support & Improved mod dependant Materials 2016-10-04 04:12:40 +01:00
Blood-Asp
92294c1f88 MT script parser + metaitem reenabler do now work 2016-10-02 21:39:42 +02:00
Dragon2488
13155cb4da 123 2016-10-02 11:15:33 +07:00
Blood-Asp
e607bcc020 fix asteroid worldgen 2016-09-30 22:31:16 +02:00
Blood-Asp
928c07b439 Reenable GregTech Capes 2016-09-30 22:31:04 +02:00
Blood-Asp
4fd6c2ae72 Fix fusion reactor not using input fluids. 2016-09-30 22:30:16 +02:00
Blood-Asp
7079dccb8c Fix short distance teleport & readd null check on tools 2016-09-30 22:30:02 +02:00
Dragon2488
6bacb14144 Render Performance: 2 2016-09-30 23:20:15 +07:00
Blood-Asp
ab10a5d748 fix asteroid worldgen 2016-09-30 00:31:43 +02:00
Blood-Asp
d665022f4f Reenable GregTech Capes 2016-09-29 16:21:33 +02:00
Muramasa
c0f1fce859 Small fixes & Stop storage blocks and fluids for disabled materials 2016-09-29 07:36:45 +01:00
Dragon2488
0dcfc8e5f0 Render Lags fix 2016-09-29 07:06:37 +07:00
Blood-Asp
18e8ee1ad3 Fix fusion reactor not using input fluids. 2016-09-28 19:55:31 +02:00
Blood-Asp
7b8573d32e Fix short distance teleport & readd null check on tools 2016-09-28 14:05:10 +02:00
Muramasa
16a3c059b3 Fix pollution onWorldTick server crash 2016-09-28 13:23:21 +02:00
Muramasa-
0570c23ea6 Fixes harvest crash 2016-09-28 13:22:46 +02:00
Muramasa
7b7e0d8a78 Fix pollution onWorldTick server crash 2016-09-28 08:07:07 +01:00
Muramasa-
0ada20e86f Fixes harvest crash 2016-09-28 05:45:30 +01:00
Muramasa
5fbfa73be9 Update, bump version and Most of TGreg compat fixes 2016-09-27 23:39:42 +01:00
Blood-Asp
d632ac2ab8 fix interdimensional teleport 2016-09-27 20:31:04 +02:00
Muramasa
919a75686d Upadate with exp changes 2016-09-27 17:29:51 +01:00
Blood-Asp
7074a513ab Pollution configs and first effects 2016-09-27 16:35:03 +02:00
Blood-Asp
16fb901529 More Pollution & bugfixes 2016-09-27 02:00:19 +02:00
Muramasa-
97d7efcc22 Possible fix for scanner TE error 2016-09-26 14:03:20 +01:00
Muramasa
3ee18ca555 Cleanup, disable auto TE recipes with config and fixes 2016-09-25 00:25:15 +01:00
Muramasa
fed8109b17 Update with exp changes 2016-09-24 23:05:18 +01:00
Blood-Asp
380211de8a fix orehiding hiding all ores instead of only the unneeded. 2016-09-24 19:56:58 +02: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
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
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
Muramasa
b22bb2dfa6 Update Part 1 2016-09-15 15:48:47 +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
Dragon2488
d9aa2535e6 JEI support, build.gradle update 2016-09-12 18:07:17 +07: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
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
415e683a43 Configurable components & fixes 2016-08-31 02:22:51 +01:00
Blood-Asp
8086832d88 tmp fix for #595 2016-08-25 17:28:19 +02:00
Léa Gris
6401399e94 May or may not fix https://github.com/Blood-Asp/GT5-Unofficial/issues/565
Possibly fix issue #565 Assembly line books: item names not shown correctly on server
Possibly not the right way but it should do.
2016-08-23 23:05:50 +02:00
Muramasa-
ccfc536501 Merge pull request #603 from Muramasa-/Mats
Material Rework
2016-08-22 22:50:58 +01:00
Blood-Asp
49e5b53706 #573 Turbines now explode when producing more EU than dynamo can handle 2016-08-22 23:01:29 +02:00
Blood-Asp
9ff430c80d Fix #598 Delete saved recipe on machine change 2016-08-22 22:38:28 +02:00
Muramasa
f8bd23f1b1 Fixes #561 2016-08-22 20:23:29 +01:00
Muramasa
afe222d2c1 Fixes #559 2016-08-22 20:21:53 +01:00
Muramasa
55133748f1 Fixes #561 2016-08-22 16:49:25 +01:00
Muramasa
a0066b4a26 General cleanup & MaterialProcessing 2016-08-21 11:57:36 +01:00
Muramasa
46daf120bb initMaterialProperties 2016-08-19 12:15:05 +01:00
Dragon2488
91d9e24cd6 Port: Part 3. FINAL STEPS. And silent for next 11 days. 2016-08-18 20:45:27 +07:00
Muramasa
6917673264 Initial
Fixed Materials limitation
Added ability to add Materials via a config
Added ability to change all properties of a Material via a config
2016-08-17 06:09:55 +01:00
Muramasa
ccc7a18739 Bugfixes 10 2016-08-15 21:56:56 +01:00
Muramasa
7874d1c91f Bugfixes 8 2016-08-14 08:06:00 +01:00
Muramasa
5eb2857389 Bugfixes 3/2/1 fix: Remove commented code 2016-08-14 07:40:20 +01:00
Muramasa
30b7a0d7e8 Bugfixes 4 fix: Remove commented code 2016-08-14 07:34:36 +01:00
Muramasa
1abb196a2f Bugfixes 5 fix: Removed commented code 2016-08-14 07:32:19 +01:00
Muramasa
25fe49f9c5 Bugfixes 6 fix: missed a file 2016-08-14 07:25:18 +01:00
Muramasa
f94313e9b1 Bugfixes 6 fix: Removed commented code 2016-08-14 07:24:57 +01:00
Muramasa
e85097319b Bugfixes 7 2016-08-14 07:19:03 +01:00
Muramasa
19062e1d36 Bugfixes 6 2016-08-14 05:56:41 +01:00
Muramasa
bfccecf87b Bugfixes 5 2016-08-14 05:36:12 +01:00
Muramasa
b6032a3bd2 Bugfixes 4 2016-08-14 05:09:34 +01:00
Muramasa
2bd06dc60e Bugfixes 3 2016-08-14 04:58:51 +01:00
Muramasa
8cdba03c0a Bugfixes 2 2016-08-14 03:50:59 +01:00
Muramasa
27917b29b3 More String var changes 2016-08-13 15:01:09 +01:00
Muramasa
009709462e TryCatch changes 2016-08-13 10:10:11 +01:00
Muramasa
0345ada52c Remove null checks 2016-08-13 09:10:38 +01:00
Muramasa
9ca24419fb HashMap > ConcurrentHashMap & String vars 2016-08-13 08:28:24 +01:00
Muramasa
27f2ee906a Rest of d2a098f 2016-08-13 07:23:34 +01:00
Muramasa
7d3615d74a For loop changes 2016-08-13 07:18:11 +01:00
Muramasa
ce1195d48c Worldgen and Random changes 2016-08-13 07:15:58 +01:00
Muramasa
349510f2da Bugfixes 1 2016-08-13 07:09:55 +01:00
Muramasa
4ee250357e GT_Block_Ores_GC Null check 2016-08-10 21:28:19 +01:00
Muramasa
1647387280 GC Ore Support 2016-08-10 21:14:53 +01:00
Dragon2488
6606382172 Port: Part 2. gregtech.common.blocks, gregtech.common.entities, gregtech.common.render 2016-08-11 02:43:37 +07:00
Dragon2488
73a677f6bf Port: Part 1. gregtech.api, gregtech.common.covers, gregtech.common.render 2016-08-07 15:41:31 +07:00
Muramasa
a1a65ef0f6 Use dim name for GC worlds. 2016-08-02 09:33:22 +01:00
Muramasa
ed89ccbc4f Remove asteroids from isGenerationAllowed 2016-08-01 15:08:11 +01:00
Muramasa
b5b8ea974f Bugs & Removal of GG's TileEntityOres 2016-07-29 20:13:02 +01:00
Muramasa
25209a4bcb Merge GG into GT 2016-07-29 18:54:45 +01:00