Commit graph

622 commits

Author SHA1 Message Date
Blood-Asp
a6216b8cf0 Count pipe transfers on input not output side 2016-09-27 18:11:19 +02: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
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
Muramasa
291839871e Reduce disabled component creation & GT_Proxy postInit -> Processors 2016-09-23 02:28:29 +01:00
Muramasa-
8f2e13681b Merge pull request #632 from Muramasa-/Bugfixes
Various Bugfixes
2016-09-20 17:03:18 +01: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
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
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
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
Muramasa
f53fb2b84b Bugfixes and now using built in OrePrefixes enabled/disabled lists 2016-09-09 14:25:59 +01: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
Muramasa
e1d777397f Fix lens recipes & duplicate config list entries 2016-08-31 03:58:43 +01: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
c66db54eab Fixes & work on #266 2016-08-23 16:39:20 +01:00
Muramasa-
ccfc536501 Merge pull request #603 from Muramasa-/Mats
Material Rework
2016-08-22 22:50:58 +01:00
Muramasa
5a94ea039b Some cleanup 2016-08-22 22:31:19 +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
5466ac4f52 Fixes #599 2016-08-22 20:25:13 +01: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
29ebfa577c Fixes #599 2016-08-22 16:47:43 +01:00
Muramasa
a987228a6a Small fixes 2016-08-22 11:39:04 +01:00
Muramasa
0c4ec9a724 More compatibility fixes 2016-08-21 13:26:38 +01:00
Muramasa
a0066b4a26 General cleanup & MaterialProcessing 2016-08-21 11:57:36 +01:00
Muramasa
96b402648b Constructor fix 2016-08-19 13:19:16 +01:00
Muramasa
2c2105284c Whoops 2016-08-19 12:17:08 +01:00
Muramasa
46daf120bb initMaterialProperties 2016-08-19 12:15:05 +01:00
Muramasa
eaadf6f74b Config work 2016-08-18 07:00:57 +01: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
0d9c100ade Const bool changes 2016-08-14 22:34:45 +01:00
Muramasa
0307f682b5 Bugfixes 9 2016-08-14 08:36:42 +01:00
Muramasa
5e5fa8cf38 Revert switch change 2016-08-14 08:12:25 +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
c7ddde35e8 Small fix 2016-08-13 10:12:40 +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
d2a098f80e PostInit reduction & Save registered recipes (No speed loss) 2016-08-13 07:18:32 +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
Blood-Asp
b3bd42ba8c Merge pull request #594 from Technus/experimental
Paintable Wires
2016-08-10 20:22:47 +02:00
Daniel
450bb19519 Paintable Wires 2016-08-07 08:39:14 +02: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
Blood-Asp
c8cca6390b Merge pull request #584 from OneEyeMaker/SmoothTransition
More work on deprecated heating coils.
2016-07-27 23:52:39 +02:00
Blood-Asp
c59f2e6611 Merge pull request #583 from Muramasa-/Fixes
Remove UBC Dependency
2016-07-27 23:51:41 +02:00
OneEyeMaker
be79f288a8 Added code for Pyrolyse Oven to smoothly replace deprecated coils. 2016-07-27 15:26:14 +03:00
OneEyeMaker
078a3bedde Added code for Oil Cracker to smoothly replace deprecated coils. 2016-07-27 14:59:56 +03:00
OneEyeMaker
848f84f35c Added code for Multi Smelter to smoothly replace deprecated coils. 2016-07-27 13:17:57 +03:00
OneEyeMaker
a8647b8929 Added code for Electric Blast Furnace to smoothly replace deprecated coils. 2016-07-27 13:02:12 +03:00
Muramasa
33f6c84be3 Use GameRegistry 2016-07-27 04:44:32 +01:00
Muramasa
a1a25d42dd Remove UBC Dependency 2016-07-27 04:21:53 +01:00
Blood-Asp
b4bcebf458 Handle fuel value as integer 2016-07-27 01:58:32 +02:00
OneEyeMaker
9c788fa292 Restored TextureSets 2016-07-26 20:02:41 +03:00
OneEyeMaker
eec5b2faa7 Fixed merge conflicts. 2016-07-26 09:02:10 +03:00
OneEyeMaker
9946e904b4 Merge branch 'experimental' into NewFeatures 2016-07-26 09:01:16 +03:00
OneEyeMaker
c4bd35d7cd Coils should be deprecated 2016-07-26 07:31:57 +03:00
Muramasa
16cac26b72 Separated multiblock overlay and gui textures 2016-07-26 00:52:30 +01:00
Blood-Asp
bd51aba156 Merge pull request #576 from Muramasa-/UBCSupport
UBC Support / Ore System Restructure
2016-07-26 00:56:21 +02:00
Muramasa
3bbd32136f Method simplification
Simplified some methods.
Fixed incorrect honey requirement for scanning forestry species.
Tweaked a tooltips.
2016-07-25 23:04:21 +01:00
OneEyeMaker
13caf1d699 Changed method of "repairing" of overheated coils.
Also moved initialization of SubTags to prevent NoClassDefFoundException.
2016-07-25 11:33:07 +03:00
OneEyeMaker
b6e4f869b8 Redesigned achievements. 2016-07-24 15:47:50 +03:00
DEMOOH
a5ba9e57fa Update GT_FuelLoader.java
Changed MK3 Naquadah Reactor to return naquadah cell instead of empty cell.
2016-07-24 15:32:26 +03:00
OneEyeMaker
4aaafe53f5 Changed Blast Furnace temperatures of some materials.
Now EV materials require HV+ heating coils, IV materials requires EV+ coils.
2016-07-24 10:27:03 +03:00
Muramasa
d756cebd17 Fix "stone" veins
Fix an issue where an "stone" vein would override ore textures but not
other stones.
Added missing small ore for marble and basalt.
Removed wither check from Block_Stones.
2016-07-23 03:09:25 +01:00
Muramasa
2704680a2e Fix convertOre 2016-07-22 04:31:57 +01:00
Muramasa
5fe4798e6b Fix harvest level 2016-07-22 02:58:39 +01:00
Muramasa
676e326ec0 Various fixes/cleanup
Game will no longer crash without UBC loaded
Added missing mallet textures to materialicon Lignite
2016-07-22 01:41:51 +01:00
OneEyeMaker
b3279513a3 Any component should require cables of its tier. 2016-07-21 16:59:56 +03:00
OneEyeMaker
2f454b9d82 Cables from IV materials and used as IV components should be IV. 2016-07-21 13:22:28 +03:00
DEMOOH
aa2196978b Update GT_MachineRecipeLoader.java
Added pitchblende multiplication recipe with Reactoria leaves.
2016-07-21 11:28:19 +03:00
Muramasa
248ce596a5 Ore System Rewrite part 2
Lots of ore system changes
Added Marble/Basalt gen
Ore Mixes can now have a specified biome name that they can only spawn
in
2016-07-21 07:24:42 +01:00
OneEyeMaker
47ce855868 Redefined some wires. Added last heating coil block. 2016-07-21 08:48:22 +03:00
OneEyeMaker
b7943a30c3 Fixed Blast Furnace recipe for Naquadah Alloy. 2016-07-20 10:45:46 +03:00
OneEyeMaker
f98e51a82f Added new tier of heating coils.
//TODO: Find material for LuV coils.
2016-07-20 10:27:47 +03:00
Muramasa
de6e90a000 Ore system rewrite 2016-07-18 19:00:53 +01:00
OneEyeMaker
bd689c6253 Merge pull request #1 from OneEyeMaker/NewFeaturesIncompatible
Heating coils moved to separated block.
2016-07-18 15:44:35 +03:00
OneEyeMaker
ea5305f7df Restored broken compatibility. 2016-07-18 14:56:21 +03:00
OneEyeMaker
2b9d87f293 Naquadah should be more expensive. 2016-07-18 10:16:55 +03:00
OneEyeMaker
8bf5b61dea Moved all coils to another block. 2016-07-18 10:05:44 +03:00
OneEyeMaker
ce1e6917e0 Preparations for moving all heating coils to another block. 2016-07-18 09:06:26 +03:00
OneEyeMaker
effe6699f5 Now Naquadria (source of Neutronium) requires highest tier of heating coils. 2016-07-17 17:29:18 +03:00
OneEyeMaker
b780ef6c2c Updated tooltips 2016-07-17 16:16:43 +03:00
OneEyeMaker
c9bc17bce5 Added new heating coil blocks. 2016-07-17 15:20:29 +03:00
Muramasa
51e269e3f5 Initial
This is more of a test and resource for when I eventually rewrite the
GT5U ore texture/metadata system.
2016-07-16 23:48:25 +01:00
DEMOOH
8419ddaefc Update GT_Cover_Fluidfilter.java 2016-07-17 00:07:10 +03:00
Blood-Asp
be3a6292bb Remove ghost items from Assembly Line input slots 2016-07-12 22:04:36 +02:00
Blood-Asp
435c3cd526 Update GT Capelist URL 2016-07-10 20:28:35 +02:00
Blood-Asp
704d534b43 More Pollution work 2016-07-03 18:35:51 +02:00
Blood-Asp
57deb3b3e1 Pollution basework 2016-07-03 18:31:06 +02:00
Blood-Asp
d21357bd84 Name fixes 2016-07-03 12:37:21 +02:00
Blood-Asp
f027492fb2 Rised generator internal EU storage to counter production bug 2016-07-03 11:55:45 +02:00
Blood-Asp
c57aeee3ce rebalancing sifting output 2016-07-02 23:28:43 +02:00
Blood-Asp
ca0b8f396e make GT trigger ic2 achievements 2016-07-02 22:35:29 +02:00
Blood-Asp
c120f69351 Finished adding all component assemblyline recipes 2016-07-02 19:05:17 +02:00
Blood-Asp
d328f7bc88 Fix IC2 glass crash 2016-07-02 12:40:30 +02:00
Blood-Asp
c320af9f3e Even more changes 2016-07-01 22:23:04 +02:00
Blood-Asp
c2be6ff64c Small fixes and rebalances 2016-07-01 21:44:44 +02:00
Blood-Asp
20de7ff06f PR fixes: Turbine casings readded, Dieselgen readded, balancing changes
Also deactivated higher tier pumps, these cover so huge areas, that
servers lag extremely.
Nerfed new cables a bit.
2016-07-01 18:08:01 +02:00
Muramasa
1b162ae25e Changed wire/rotor components 2016-07-01 15:41:08 +01:00
Muramasa
63f64cb514 Initial 2016-07-01 13:15:55 +01:00
Blood-Asp
bcbeebf3b8 First Assemblyline recipes 2016-07-01 02:06:51 +02:00
Blood-Asp
b465f8f25c Adding LuV, ZPM and UV components 2016-07-01 01:41:28 +02:00
Blood-Asp
1497dc47e5 Merge pull request #550 from Muramasa-/Default
Turbine tooltip fixes
2016-07-01 01:16:10 +02:00
Blood-Asp
f496def067 Fixed Pyrooven overclocking 2016-07-01 01:14:35 +02:00
Blood-Asp
73749472d2 Finish Assemblyline recipe printing 2016-07-01 01:13:09 +02:00
Blood-Asp
7ee09889d9 Finish Assemblyline recipe check 2016-06-30 22:17:18 +02:00
Muramasa
d8df9e1565 Turbine tooltip fixes 2016-06-30 18:14:34 +01:00
Blood-Asp
173e5a11d7 Merge pull request #547 from perkinslr/experimental
Make plasma turbine output cooled versions of plasma
2016-06-30 14:49:25 +02:00
Logan Perkins
ad8ad42542 Update GT_MetaTileEntity_LargeTurbine_Plasma.java 2016-06-29 22:37:41 -07:00
Blood-Asp
90d776893e More Assembly Line recipe work 2016-06-30 00:12:00 +02:00
Blood-Asp
22525fd6e8 Merge pull request #546 from perkinslr/experimental
Fix 'cannot find symbol' error in AdvMiner2
2016-06-29 00:23:44 +02:00
Logan Perkins
fcb685693e Update GT_MetaTileEntity_AdvMiner2.java 2016-06-27 17:28:18 -07:00
Logan Perkins
9be4d8c270 Update GT_MetaTileEntity_AdvMiner2.java 2016-06-27 17:20:47 -07:00
Logan Perkins
4adb6554c2 Update GT_MetaTileEntity_AdvMiner2.java 2016-06-27 17:12:02 -07:00
Blood-Asp
b9ee95c797 AL Recipe work 2016-06-27 23:49:18 +02:00
Logan Perkins
dfb263e7dd Update GT_MetaTileEntity_AdvMiner2.java 2016-06-25 15:43:13 -07:00
Logan Perkins
1fe2787532 Update GT_MetaTileEntity_AdvMiner2.java 2016-06-24 20:50:10 -07:00
Logan Perkins
577ea17e65 Update GT_MetaTileEntity_AdvMiner2.java 2016-06-24 20:45:04 -07:00
Logan Perkins
9ed45df5b7 Update GT_MetaTileEntity_AdvMiner2.java 2016-06-24 16:18:03 -07:00
Blood-Asp
01b15f4251 Make Railcraft item Retrival name independent 2016-06-25 00:24:25 +02:00
Blood-Asp
e21311b919 Fix Superfuel railcraft compat and expand thaumcraft check 2016-06-24 17:49:22 +02:00
Blood-Asp
cea067c613 More superfuel fixes 2016-06-24 01:08:26 +02:00
Blood-Asp
25a0b460d4 Fix fluiddeath 2016-06-24 00:57:45 +02:00
Blood-Asp
df6e07b5cd Merge pull request #537 from Muramasa-/DieselGenerator
Fuel efficiency changes for Large Diesel Engine
2016-06-24 00:41:46 +02:00
Blood-Asp
104715c86c missed a bit 2016-06-23 23:44:07 +02:00
Blood-Asp
72ff25f9b7 Add new Fuel, Fix emitter and field gen recipes, add charcoal/lignite block fuel values 2016-06-23 23:43:22 +02:00
Muramasa
5263c85dc5 Fuel efficiency changes for Large Diesel Engine 2016-06-23 20:02:43 +01:00
Blood-Asp
210fc268b1 Remove old crop processing code 2016-06-23 19:31:02 +02:00
Blood-Asp
1d9eb4093e Readjusted Notch Apple fuel value 2016-06-23 18:45:59 +02:00
Blood-Asp
11721a7765 Changed Field Generator recipes 2016-06-23 01:02:58 +02:00
Techlone
ee2abbd3f2 AdvMinerII: check that ore block still exists; consider chance output 2016-06-22 01:30:27 +05:00
Blood-Asp
7a9c3857e2 Merge pull request #526 from perkinslr/experimental
Make processing array handle multiple input stacks at a time
2016-06-21 19:56:34 +02:00
Blood-Asp
5728c8d93f Merge pull request #534 from Muramasa-/DieselGenerator
Bug Fixes
2016-06-21 19:56:20 +02:00
Blood-Asp
75d71e546b Fix fced86e11a hiding almost all metaitems 2016-06-21 19:51:54 +02:00
Muramasa
434450107b This client likes to uncheck files 2016-06-21 18:28:29 +01:00
Muramasa
6e656668cc Wrong pipe oredict 2016-06-21 00:35:10 +01:00
Muramasa
7e52fb2805 Bug fixes for my commits
Removed commented out old turbine texture code
Fixed Diesel Engine "Fuel Value" unit to EU/L
Fixed mistake with Diesel Engine tooltip. Now asks for Gear boxes.
Forgot to add recipe for Engine Intake.
Redone the Gas/HPSteam turbine recipes.
Fixed Oxygen/Lube being consumed if there is diesel in the hatch, but
not enough for the engine to run
Updated Engine GUI
2016-06-21 00:17:21 +01:00
Logan Perkins
f16aeb2d1f Update GT_MetaTileEntity_ProcessingArray.java 2016-06-19 15:58:04 -07:00
Blood-Asp
f708fc5ff8 Corrected Wood Plates burn value 2016-06-20 00:40:00 +02:00
Blood-Asp
d61667d436 Improved Ultimet stats 2016-06-20 00:39:42 +02:00
Blood-Asp
6af9d982c8 Notch apple to magic fuel 2016-06-20 00:24:09 +02:00
Blood-Asp
77a163e0e4 Fix infinite miningpipes exploit from advanced miner 2 2016-06-20 00:21:41 +02:00
Blood-Asp
dcfa9c5df9 nerfed biogas from distillery 2016-06-20 00:11:29 +02:00
Blood-Asp
8269cd58e6 Fix wrong energy values for comp and crop processing 2016-06-20 00:07:55 +02:00
Blood-Asp
9887777ddd Cheaper chemical string production 2016-06-20 00:05:22 +02:00
Blood-Asp
491a6d6c4b Plunger also emptys input tank after output tank is empty 2016-06-19 22:44:28 +02:00
Blood-Asp
2427bc1521 Make distillation tower work with different fluids in input hatches 2016-06-19 22:02:19 +02:00
Blood-Asp
91fc3a20cd Implement IBoxable for radioactive componentes 2016-06-19 20:49:52 +02:00
Blood-Asp
6b556371aa Fixed Entchanted Books in magic absorber 2016-06-19 20:36:49 +02:00
Blood-Asp
20201d069a Fixed Magic Energy Absorber efficiency calculation 2016-06-19 20:23:49 +02:00
Blood-Asp
e340d17337 Improved Neutronium for being highest tier material 2016-06-19 19:55:22 +02:00
Blood-Asp
537d6e9330 changed plasma turbine damage and added config 2016-06-19 19:43:14 +02:00
Blood-Asp
87ef0280f0 Remove unused recipe code 2016-06-19 19:34:26 +02:00
Blood-Asp
7424f75315 Added missing machines to processing array 2016-06-19 19:15:07 +02:00
Blood-Asp
ffd9964cd3 Changed Bittle charcoal tool back to axe 2016-06-19 19:02:48 +02:00
Blood-Asp
f2525afb8d Moved Bee init earlier 2016-06-19 18:29:59 +02:00
Blood-Asp
96607760e1 EnderIO Wrench Support 2016-06-19 18:23:28 +02:00
Blood-Asp
1ace2c4e35 Blacklist Unstable Ingots from unification 2016-06-19 17:42:43 +02:00
Blood-Asp
183a681d52 IC2 Single-Use battery support 2016-06-19 17:36:54 +02:00
Blood-Asp
3a249d8075 Merge pull request #500 from Muramasa-/DieselGenerator
Large Diesel Generator
2016-06-19 17:12:23 +02:00
Techlone
ef23dc90b2 Fix #469 #508 2016-06-19 18:03:01 +05:00
Muramasa
58ed5088e1 Final commit 2016-06-12 19:32:29 +01:00
Logan Perkins
54ae577be0 Make recipe input work for split stacks 2016-06-12 10:41:52 -07:00
Logan Perkins
c596231af4 Make processing array use all input stacks 2016-06-12 10:39:33 -07:00
Muramasa
237e5e682d Possibly final commit 2016-06-01 06:34:33 +01:00
Blood-Asp
dc2a48259a Merge pull request #518 from Muramasa-/TweaksAndFixes
Crash  Fix / Various Tweaks
2016-05-27 20:11:07 +02:00
Blood-Asp
35a7a99808 Merge pull request #515 from OneEyeMaker/OreProcessing
Added configuration file, that enables processing of ores
2016-05-27 20:07:37 +02:00
Blood-Asp
d4f00173e5 Merge pull request #511 from MauveCloud/experimental
Added missing assembler recipes for casings
2016-05-27 20:04:40 +02:00
MauveCloud
d1b737c6cc Fixed incomplete redo of brittle charcoal adventure fix
(had reverted after improper testing with axe instead of shovel, then
neglected to check rebuilding with gradle after re-implementing fix in
source)
2016-05-26 09:57:39 -07:00
MauveCloud
f5bb397009 Reinforced Block and Brittle Charcoal fixes
Added fixes for #503 and #436
2016-05-26 07:43:02 -07:00
Muramasa
79fc84d5d2 isPlasmaCellUsed additional null check 2016-05-26 00:55:34 +01:00
Muramasa
fced86e11a Fixes #268. Shows plasma cells that have a fusion recipe 2016-05-26 00:52:09 +01:00
Muramasa
ab6c431b88 Rearranged two achievements. Fixes #478 2016-05-25 22:25:24 +01:00
Muramasa
bbcc38e930 More fixes for #507 2016-05-25 19:16:41 +01:00
Muramasa
2cad97e975 Fixes #507 2016-05-24 22:02:46 +01:00
Muramasa
0fadfa2543 Fixes #501 2016-05-24 21:37:46 +01:00
Muramasa
3c32671623 Crash Fix 2016-05-24 00:05:20 +01:00
Muramasa
680676e411 Redone Tooltips and some scanner info 2016-05-24 00:04:36 +01:00
Muramasa
cddca6e2be Derp 2016-05-23 18:40:01 +01:00
Muramasa
960087a0a8 Cleanup + Improvement 2016-05-23 18:15:21 +01:00
Muramasa
4fdbf01fae My client likes to uncheck files 2016-05-20 05:37:43 +01:00
Muramasa
8880eb8d6d Basically a rewrite 2016-05-20 05:36:32 +01:00
OneEyeMaker
5169c509d6 Added configuration file to enabling processing of ores 2016-05-18 07:41:36 +03:00
MauveCloud
b2e564412f Added missing assembler recipes for casings
Added missing assembler recipes for casings: Basic Machine Casing, UV
Machine Casing, Heat Proof Machine Casing, Cupronickel Coil Block,
Kanthal Coil Block, Nichrome Coil Block, Superconducting Coil Block,
Solid Steel Machine Casing, Frost Proof Machine Casing, Robust
Tungstensteel Casing, Clean Stainless Steel Casing, Stable Titanium
Casing, Fusion Casing, Turbine Casing, Stainless Steel Turbine Casing,
Titanium Turbine Casing, Tungstensteel Turbine Casing
2016-05-12 14:24:04 -07:00
Blood-Asp
3f46725bbc Fix Butput Bus :P 2016-04-29 20:54:09 +02:00
Muramasa
4a59d0efbd Implemented Output Calculation 2016-04-29 07:31:58 +01:00
MauveCloud
b69385d29b Merge remote-tracking branch 'refs/remotes/Blood-Asp/experimental' into experimental 2016-04-28 11:30:29 -07:00
MauveCloud
a88988770b Improved brittle charcoal handling. 2016-04-28 11:30:00 -07:00
Muramasa
6c2c76bd06 Require Titanium Pipe Casing 2016-04-28 02:31:00 +01:00
Muramasa
a62b061968 More Fixes
TODO:
Require Dynamo back centered (Currently anywhere)
Require Muffler top centered (Currently anywhere)
Implement output calculation
Implement coolant requirement (Water or IC2Coolant?)
Possible add different tiers of diesel generator?
2016-04-28 02:16:11 +01:00
Muramasa
76902f45f7 More Cleanup and finalizing 2016-04-28 01:52:46 +01:00
MauveCloud
9036858017 Improved output bus handling 2016-04-27 17:31:20 -07:00
Muramasa
97eb99bd5d Main Commit for Large Diesel Generator 2016-04-28 00:58:55 +01:00
Blood-Asp
5c8eec846d Merge pull request #493 from Muramasa-/TurbineCasingRebalance
Turbine casing rebalance
2016-04-27 21:18:29 +02:00
MauveCloud
784c65a884 Added Crop Calculator support. 2016-04-26 13:30:26 -07:00
Muramasa
cb962573e2 Missed a file 2016-04-19 23:31:41 +01:00
Muramasa
d713c5ddec Remove Diesel Turbine 2016-04-19 23:19:59 +01:00