Sangui/GT5-Unofficial
2
1
Fork 0
Code Issues 6 Pull requests Projects Releases Packages Wiki Activity Actions
950 commits 8 branches 203 tags 97 MiB
Commit graph

770 commits

Author SHA1 Message Date
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
Blood-Asp
a35cb1084f Merge pull request #569 from OneEyeMaker/NewFeatures 
New Heating coils.
 2016-07-27 01:52:15 +02:00
Draknyte1
dafe88d8e8 Makes GT Sound volume adjustable via proper sliders. 2016-07-27 07:46:59 +10: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
240d346883 Fixes #367 by adding missing buttons to guis 2016-05-24 21:59:42 +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
Muramasa
12a1d1c46e Main Commit 2016-04-19 23:17:31 +01:00
Muramasa
79444adc76 Revert "Turbine Rebalance" 
This reverts commit ddc0c4299e.
 2016-04-17 07:41:35 +01:00
Muramasa
ddc0c4299e Turbine Rebalance 
Added 3 new turbine casings to rebalance the turbines. Also changed
turbine controller recipes to fit the rebalance.

Large Steam: Steel Turbine Casing
Large HP Steam Turbine: Stainless Steel Turbine Casing
Large Gas Turbine: Steel Turbine Casing
Large Diesel Turbine: Titanium Turbine Casing
Large Plasma Turbine: Tungstensteel Turbine Casing
 2016-04-17 07:40:10 +01:00
Muramasa
063b62b4ca Fixed newMetaEntity using Plasma Generator 2016-04-17 03:05:58 +01:00
Muramasa
31e4330b69 Large Diesel Generator 
Added large diesel generator to the game. It replicates the Large Plasma
Generator but it's nominal output is 1/8 that plasmas is.

Plasma Nominal: Optimal Steam Flow * 40
Diesel Nominal: Optimal Steam Flow * 5
 2016-04-17 01:41:06 +01:00
Blood-Asp
c98736b7b3 Adding assembly line recipe check 2016-04-11 23:14:57 +02:00
Blood-Asp
22dd09be01 Adding assembly line recipes 2016-04-11 22:30:53 +02:00
Blood-Asp
83344732eb Cleanup 2016-04-11 21:50:01 +02:00
Blood-Asp
3aae928510 Added Assembly Line Multiblock 2016-04-11 21:47:53 +02:00
Alkalus
e634563157 Update ProcessingPipeMedium.java 
Apparently it has a newline at the end.
 2016-04-11 20:54:52 +10:00
Alkalus
f1af2039bb Update ProcessingPipeSmall.java 
Apparently it has a newline at the end.
 2016-04-11 20:54:45 +10:00
Alkalus
63d70c3ff0 Update ProcessingPipeLarge.java 
Apparently it has a newline at the end.
 2016-04-11 20:54:27 +10:00
Draknyte1
36a97e706b Submitting PR's is a pain. 
Always use most up to date files for the repo you're contributing to. #NotGT5.8Files
 2016-04-11 20:47:30 +10:00
Draknyte1
0f8d8b95d1 Merge branch 'UpToDateGTPRBranch' of https://github.com/draknyte1/GT5-Unofficial into UpToDateGTPRBranch 2016-04-11 20:36:08 +10:00
Draknyte1
523d2c449e Should fix any issues. 2016-04-11 20:34:56 +10:00
Alkalus
ba1f0f99ab Update GT_MetaGenerated_Tool_01.java 
left a : not a ;
 2016-04-10 19:29:56 +10:00
Draknyte1
1d279c741f Made these up to date with latest experimental commit, as mine were slightly out of date. :) 2016-04-10 19:15:41 +10:00
Draknyte1
26e60b7020 Changed a few things to make the Soft Hammer more noticeable from the Hard Hammer. 
Now it's a soft Mallet with an inverted icon, as requested by @DarknessShadow - https://github.com/Blood-Asp/GT5-Unofficial/issues/407

# Conflicts:
#	src/main/java/gregtech/api/enums/OrePrefixes.java
#	src/main/java/gregtech/common/items/GT_MetaGenerated_Tool_01.java
#	src/main/java/gregtech/loaders/oreprocessing/ProcessingPipeLarge.java
#	src/main/java/gregtech/loaders/oreprocessing/ProcessingPipeMedium.java
#	src/main/java/gregtech/loaders/oreprocessing/ProcessingPipeSmall.java
 2016-04-10 18:36:52 +10:00
Léa Gris
aa922c5470 Re Fix #472 #219 2016-04-04 18:43:35 +02:00
Léa Gris
8a2406de8a Fix #472 #219 2016-04-04 18:20:54 +02:00
Blood-Asp
9e5819e931 made EV charger recipe oredict 2016-04-02 16:18:08 +02:00
Blood-Asp
b71fa8f042 advminer2 2016-03-28 03:36:09 +02:00
Blood-Asp
b8579b2ee3 small fixes to distillation tower and advMiner2 2016-03-28 03:35:21 +02:00
Blood-Asp
af20a2e4ab Show all ingot fluid extractions and all iron/copper arc furnace recipes 2016-03-27 17:50:10 +02:00
Blood-Asp
80d362ceb8 Stop disassembler destroying not electric GT tools 2016-03-27 16:54:11 +02:00
Blood-Asp
44f3e89bdf Rebalance oil processing and improve pipe covering 2016-03-27 16:43:03 +02:00
Blood-Asp
e56a98af45 Update Charcoal pit tooltip 2016-03-27 15:26:36 +02:00
Blood-Asp
6e0f90964e Fix regulator crafting recipes 2016-03-20 23:34:09 +01:00
Blood-Asp
b2ac24e85a Tooltip fix 2016-03-20 17:08:33 +01:00
Blood-Asp
41af922dd2 Gunpowder no longer unlocks clean dust achievement 2016-03-20 16:51:01 +01:00
Blood-Asp
009c032c13 Hiding of Recycling recipes and unneeded ores in NEI 2016-03-20 16:47:17 +01:00
Blood-Asp
ac258896de remove console print 2016-03-20 14:59:07 +01:00
Blood-Asp
529c28649a Fix item detector not working correctly 2016-03-20 14:57:51 +01:00
Blood-Asp
29b387fbce fix forestry plants above meta 15 2016-03-20 14:40:45 +01:00
Blood-Asp
c7c8ba7020 More work on tool hardening 2016-03-20 01:23:03 +01:00
Blood-Asp
20cd83a175 Allow shift rightclick for screwdrivers 2016-03-19 22:15:50 +01:00
Blood-Asp
f4b8aa6f3a Add Fluid Filter and Regulator covers 2016-03-19 20:51:20 +01:00
Blood-Asp
bf5f8258cb Made HV Magic Energy Converter pre Fusion tech(Osmium) 2016-03-18 23:50:58 +01:00
Blood-Asp
b4eb7f494f Advanced Miner II fixes 2016-03-18 23:29:24 +01:00
Blood-Asp
c1f5c8c354 Added machine recipe for rotors, added silicone soft hammer 2016-03-18 23:05:38 +01:00
Blood-Asp
e8f0482b16 Dynamite impcomp and fluid mox fixes 2016-03-18 22:43:22 +01:00
Blood-Asp
e51cd6433d wildcard lathe recipes 2016-03-18 22:37:26 +01:00
Blood-Asp
32d4542fbc Added bowl lathe recipes 2016-03-18 22:29:57 +01:00
Blood-Asp
df28bd66ec HP Turbine deletes normal steam in input hatch to not get stuck 2016-03-18 22:22:27 +01:00
Blood-Asp
985130d6f4 Add Uranite crop drop 2016-03-17 23:50:12 +01:00
Blood-Asp
a8f91902d1 Improved Sense 2016-03-17 23:35:10 +01:00
Blood-Asp
cd61ff3ae1 Made Large fluid cells stack more and cheaper to build 2016-03-17 00:53:28 +01:00
Blood-Asp
a80e44f7f5 Added sharpness enchantment for HSS material tools 2016-03-17 00:49:47 +01:00
Blood-Asp
be8d29da74 Fixed turbine output falling when supplying more than opt flow 2016-03-17 00:41:15 +01:00
Blood-Asp
7ac0849c1a Added NC display support for large turbines 2016-03-17 00:28:09 +01:00
Blood-Asp
68601d5df9 Fix crop drop autoclave recipes 2016-03-16 23:57:27 +01:00
Blood-Asp
3e39b7c233 Fix large boiler tooltip 2016-03-16 23:54:23 +01:00
Blood-Asp
0a6e69e254 Rised crop root length to match IC2 again 2016-03-16 23:52:52 +01:00
Blood-Asp
2544d46c91 Fix Forestry woods above meta 15 not effected by wood nerv 2016-03-16 23:49:35 +01:00
Blood-Asp
9e7f34a12f Fix heavy oil gen without messing everything up 2016-03-16 22:49:15 +01:00
Techlone
fa3e5c0a44 Fix boost of starting of fusion reactors 2016-03-15 13:41:02 +05:00
Nidan
b43cfa2a0c Small Crop stats rebalance 
- make Trollplant obtainable again (1% chance)
- make Transformium very rare instead of almost impossible to get (0.668% instead of 0.134%)
- make Zomplant uncommon instead of very rare (1.5% instead of 0.618%)
- adjust Fertilia to remain reachable, making it a bit less rare in the process (0.967% instead of 0.794%)
(chances given are for the best possible parents; in case of Zomplant excluding Fertilia as it can only be obtained from Zomplant)
 2016-03-05 19:55:22 +01:00
Blood-Asp
1ac152cbce Merge pull request #442 from miuirussia/patch-3 
Fixed load textures
 2016-03-04 06:07:24 +01:00
Blood-Asp
dae68a771b Merge pull request #441 from leagris/experimental 
Fix EnderIO EBF Recipes tier
 2016-03-04 06:07:02 +01:00
MIUI Russia
1e747853c4 Fixed load textures 2016-03-01 23:07:54 +03:00
Léa Gris
f907c2af80 Fix EnderIO EBF Recipes tier 
EnderIO: ElectricalSteel and DarkSteel ingot where at HV tier in EBF.
These mid-game low tech materials should be on HV tech.
Also these recipes are not removed from EnderIO itself where they default to very easy process in EnderIO AlloySmelter.
 2016-02-29 10:26:33 +01:00
Blood-Asp
a475c87f17 Fixed heavy oil not generated 2016-01-30 14:39:08 +01:00
Blood-Asp
f385b880bd Adding last missing modular armor textures 2016-01-16 17:43:44 +01:00
Blood-Asp
4537392c10 Reserving Meta IDs 2016-01-10 14:18:16 +01:00
Blood-Asp
de8fbc682d removing tnt ->itnt recipe 2016-01-04 16:18:41 +01:00
Blood-Asp
874dfdc309 Fix forestry worktable crash 2016-01-03 16:49:00 +01:00
Blood-Asp
5fd2db9ef2 spelling fixes and chainsaw + forestry leaves fix 2016-01-03 05:27:51 +01:00
Blood-Asp
dd6e61da16 small fix on armor display. 2016-01-03 03:19:47 +01:00
Blood-Asp
63f9e2e457 explosives 2 2016-01-03 02:55:14 +01:00
Blood-Asp
cf69a7f392 Explosives rework 2016-01-03 02:16:02 +01:00
Blood-Asp
ab3e305e1a More new modular armor textures. 2016-01-02 21:33:57 +01:00
Blood-Asp
9ecef862e0 New Modular Armor models 2016-01-02 12:28:06 +01:00
Blood-Asp
9362235140 fix mox output not rising with heat 2015-12-29 14:42:13 +01:00
Blood-Asp
efbf251938 AE2 oredict register fix 2015-12-29 14:27:52 +01:00
Blood-Asp
87e9feebc3 fix depleted mox crashing 2015-12-29 14:15:32 +01:00
Blood-Asp
b167f73588 fix crop processing like comb processing 2015-12-29 13:38:37 +01:00
Blood-Asp
7abaa97330 add missing EBXL recipes. tmp disable modular armor recipes 2015-12-29 11:59:55 +01:00
Blood-Asp
177adcbf32 Revert "Fixed world event lag and related cauldron crash" 2015-12-29 11:57:53 +01:00
Blood-Asp
f0d8454123 fix armor textures and init 2015-12-28 17:17:52 +01:00
Blood-Asp
e8ba86746a Name fix 2015-12-28 17:17:51 +01:00
MIUI Russia
9e518a885e New debug lang for achievements generation 2015-12-25 18:21:50 +03:00
Blood-Asp
1464b07b36 Merge pull request #376 from miuirussia/patch-1 
More beautiful achievements display
 2015-12-25 16:15:30 +01:00
Blood-Asp
a4bf359b03 Initial Modular armor port (from GTExtras) 2015-12-25 16:14:52 +01:00
Blood-Asp
5132439317 Should save everything before commiting 2015-12-25 15:37:45 +01:00
Blood-Asp
1e13709399 fuel rod override v2 2015-12-25 15:09:22 +01:00
Blood-Asp
68a19fd70c Overriding IC2 fuel rods 2015-12-25 14:37:56 +01:00
MIUI Russia
a582991c10 More beautiful achievements display 2015-12-24 19:05:43 +03:00
Blood-Asp
a448be8d4a increase hot coolant energy output 4x 2015-12-21 22:08:13 +01:00
Blood-Asp
a9aac6ff58 comb processing fixes 2015-12-21 19:44:23 +01:00
Blood-Asp
9781ccd9ee fix crash without rf api 2015-12-21 18:44:07 +01:00
Blood-Asp
cc3631c8ae Made bees a bit less biome dependend 2015-12-21 16:58:06 +01:00
Blood-Asp
2baf34b03a Fixed AdvMiner II running without drilling fluid 2015-12-21 16:39:11 +01:00
Blood-Asp
30749ffeba Made UUM Berry drop chance a bit lower 2015-12-21 16:36:42 +01:00
Blood-Asp
a7176a293c Fix reprocessing exploit 2015-12-21 16:30:46 +01:00
LemADEC
63f8506fd6 Fixed world event lag and related cauldron crash 2015-12-19 21:09:16 +01:00
Blood-Asp
259ef97c7c Fix some wrong stone processing 2015-12-15 23:09:34 +01:00
Blood-Asp
f63f1e67ec Fix Emerald crop processing 2015-12-15 22:22:56 +01:00
Blood-Asp
4c8f0c5865 fix stone processing output amounts 2015-12-15 20:19:54 +01:00
Blood-Asp
8f3c48ed11 fix teleporter and improve seismic prospector 2015-12-13 18:07:59 +01:00
Blood-Asp
2bf2ecc35e Sensor kit should not stack 2015-12-13 17:56:22 +01:00
Blood-Asp
55aa306e67 Fix teleporter nuclear control support 2015-12-13 17:45:57 +01:00
Blood-Asp
8722e0e2f2 Fixed Display overflow 2015-12-13 17:35:07 +01:00
Blood-Asp
8659c9573c fixed end asteroids spawning with red granite texture 2015-12-13 17:24:34 +01:00
Blood-Asp
70e652420d change crop drop processing like bee comb processing 2015-12-13 16:45:57 +01:00
Blood-Asp
0bdf8a2e40 removed passive energy use of covers, changed size tooltips and changed comb processing 2015-12-13 16:03:22 +01:00
Blood-Asp
c84559efcc Added processing for UndergroundBiomes stone types 2015-12-11 16:03:05 +01:00
Blood-Asp
873902f4bf make steam boilers not automateable 2015-12-11 15:25:48 +01:00
Blood-Asp
e0b128e9fa fix iridium reinforced block reprocessing 2015-12-11 14:50:06 +01:00
Blood-Asp
370e46215b small fixes 2015-12-11 04:55:22 +01:00
Blood-Asp
02e556598e fixed ore achievements not working with custom ores 2015-12-10 21:02:37 +01:00
Blood-Asp
6b2e08b2ca shift + screwdriver for all covers 2015-12-10 18:25:07 +01:00
Blood-Asp
6b48991bc6 graphene was overpriced 2015-12-10 16:43:55 +01:00
Blood-Asp
052f9f2961 changed crop stats 2015-12-10 15:37:54 +01:00
Blood-Asp
2d6d8de484 clean up crop classes 2015-12-10 15:30:18 +01:00
Blood-Asp
a7c9f96647 fix thaumium block overwritten, cable error without RF api and cells getting eaten 2015-12-10 15:04:23 +01:00
Blood-Asp
3b920fa5a1 Fixed filter recipe and Steelfranks no longer need block below 2015-12-09 00:54:13 +01:00
Blood-Asp
8176a5fca9 cable burn fix and ihl compat fix 2015-12-08 23:39:41 +01:00
Blood-Asp
8078bca4b3 Moved Sulfide ore processing from IHL to GT 2015-12-06 22:37:25 +01:00
Blood-Asp
27b978f0bb tmp issue fix 2015-12-06 21:20:23 +01:00
Blood-Asp
aeb505273b Saving pumped oil amounts in chunk NBTs 2015-12-06 21:15:41 +01:00
Blood-Asp
66427b2178 fix fluidstack memory overflow 2015-12-06 18:37:10 +01:00
Blood-Asp
ef10c47d76 bunch of fixed 
Added new multiblock guis
shortend HP turbine name to fit gui
added reinforced block reprocessing
fixed crash on AE2 removal
expanded large boiler tooltips
fixed chinsel marble processing
added some recipes for alloys
 2015-12-06 07:26:06 +01:00
Blood-Asp
1ef11f2ae4 More recycler blacklisted items and ignored additional oredict because of crossmod issue 2015-12-05 00:55:46 +01:00
Blood-Asp
a625088776 Fix BasicMachines accepting wrong items in certain conditions 2015-12-05 00:33:52 +01:00
Blood-Asp
899973b0dc Fixed Quantum chest loosing items. 2015-12-05 00:04:54 +01:00
Blood-Asp
3106bfe8a2 Fix CarbonDioxide, lower outputstacksize by screwdriver + shift and hide blocks without materials 2015-12-04 22:44:27 +01:00
Blood-Asp
c79c21aa00 Rebalanced oil/fuel burn values to fit more complex processing 2015-11-30 02:37:05 +01:00
Blood-Asp
4fd0a7f473 Fix forestry compatibility and add luber ability to chainsaw 2015-11-28 20:35:20 +01:00
Blood-Asp
aeff64f935 Merge pull request #334 from doushio9967/slurp-e 
Remove duplicate repair achievements, fix HV Pump achievement.
 2015-11-25 03:00:18 +01:00
Blood-Asp
063a758961 Mass fabricator fix and Charcoal pit oredict support. 2015-11-25 02:56:23 +01:00
doushio9967
753de8ba94 Remove duplicate repair achievements, fix HV Pump achievement. 
Previously any tier pump would trigger the slurp achievement.
No idea why repair was listed thrice.
 2015-11-24 07:42:21 +01:00
Blood-Asp
143176dae3 fixed accidental sulfuric acid production 2015-11-24 03:54:21 +01:00
Blood-Asp
d2e2d83156 fixed mark3 fusion overclock 2015-11-24 03:48:28 +01:00
Blood-Asp
df1ffb0211 fixed battery hull crafting/reprocessing 2015-11-24 03:37:00 +01:00
Blood-Asp
593461f5ef fixed typo 2015-11-24 03:14:02 +01:00
Blood-Asp
5d218b68c9 fixed hull recycling 2015-11-24 02:59:04 +01:00
Blood-Asp
0c9361193a GT Bee fix + new crop textures. 2015-11-18 01:32:45 +01:00
Blood-Asp
42795f3a24 Fixed NEI dependency. 2015-11-01 15:26:26 +01:00
Blood-Asp
40324b05f9 Fixed ItemFiler OpenGL error. 2015-11-01 14:09:18 +01:00
Blood-Asp
cc89e15b5b Fix Seismic prospection without ores failing 2015-11-01 13:46:35 +01:00
Blood-Asp
571a8abbe0 Added new crop drops and processing recipes. 2015-11-01 02:47:32 +01:00
Blood-Asp
bc86770624 added config to disable crops 2015-11-01 01:57:09 +01:00
Blood-Asp
97afccb0c3 Some TC aspect registering changes 2015-11-01 01:10:52 +01:00
Blood-Asp
29fade51aa Forestry update + bee nerv 2015-10-29 00:37:04 +01:00
Blood-Asp
8d8594dabd GT Wrench now implements Buildcrafts Wrench IToolWrench 2015-10-25 23:56:58 +01:00
Blood-Asp
1e425e6622 Added burn values for caesium 2015-10-25 23:17:39 +01:00
Blood-Asp
2c178297e8 Added coolant recipes to mixer 2015-10-25 23:08:45 +01:00
Blood-Asp
0f288afe8b Added config for block harvest levels. 2015-10-25 22:52:57 +01:00
Blood-Asp
621573fe84 Fix sulfuric gas texture 2015-10-25 17:24:05 +01:00
Shawn Buckley
f9ee88cf64 Merge branch 'experimental' of github.com:Blood-Asp/GT5-Unofficial into experimental 2015-10-25 09:32:11 -04:00
Shawn Buckley
40be76a82b Merge branch cover_print_switch 2015-10-25 09:31:12 -04:00
Shawn Buckley
46f4473de6 Change if chains to switches 2015-10-25 09:27:29 -04:00
Blood-Asp
2a08dcc756 fixed unification issue 2015-10-25 14:02:52 +01:00
Blood-Asp
9b91a89e12 fix pyrolyseoven 2015-10-25 13:50:11 +01:00
Blood-Asp
b7d4d64227 new hydricsulfide -> sulfuricacid recipes 2015-10-24 23:25:00 +02:00
Shawn Buckley
756e7edc64 Fix version for stable build 2015-10-24 13:45:06 -04:00
Blood-Asp
2d7a108727 fixed naquadah cell reverse processing 2015-10-24 13:41:56 -04:00
Blood-Asp
3af644dffe Too much U235 
Turned some U235Worldgen into U238
 2015-10-24 18:53:36 +02:00
Blood-Asp
a2ad9c9e83 fixed naquadah cell reverse processing 2015-10-24 18:41:53 +02:00
Blood-Asp
8f851f0f68 Made Materials human readable again 2015-10-24 17:32:16 +02:00
Blood-Asp
b8c7137b7d Update Crop Textures 2015-10-24 15:26:26 +02:00
Blood-Asp
f34e8a8d37 missing textures 
The resources were missing all experimental textures.
 2015-10-24 15:07:23 +02:00
Blood-Asp
50016ae707 Tried updating builds. Is this right? 
cofhcore and cofhlib incompatible versions. Codechickencore missing.
Updated to a non broken forge version.
 2015-10-24 14:56:00 +02:00
Shawn Buckley
1d56c33c86 Fixed spelling of sulfuric gas. Fixes #267 2015-10-23 17:00:18 -04:00
Shawn Buckley
123aa6ed28 Reformat code 2015-10-21 22:15:09 -04:00
Shawn Buckley
9353aa711b Reformat code 2015-10-21 22:06:25 -04:00
Shawn Buckley
445e6c3f25 Replace T/F with builtin boolean values 2015-10-21 22:01:39 -04:00
Shawn Buckley
05316f03ab Update IC2 Nuclear control to 2.3.1a-Butt 2015-10-21 21:31:35 -04:00
Shawn Buckley
cda516a3e3 Update to Forestry 4 2015-10-21 21:30:33 -04:00
Shawn Buckley
c68e84f1e2 Remove jdgui-comments 2015-10-21 21:11:56 -04:00
Shawn Buckley
34ecdfb190 Replace homegrown character comparision for builtin ones 2015-10-21 20:58:55 -04:00
Shawn Buckley
23ccc9bec2 Update ore dictionary logger header language 2015-10-21 20:56:11 -04:00
Shawn Buckley
bea4cfc545 Bring in experimental branch 2015-10-21 20:47:13 -04:00
Shawn Buckley
1185424fa7 Move source files 2015-10-21 20:46:52 -04:00
Shawn Buckley
ad473b9ac0 Update IC2 Nuclear control to 2.3.1a-Butt 2015-10-20 21:23:33 -04:00
Blood-Asp
57efa552e7 Merge pull request #253 from JonnyNova/tf_squash 
Replace GT_Values.T/F with java primitive boolean values
 2015-10-20 22:47:09 +02:00
Blood-Asp
70c116c3df update to forestry 4.0 2015-10-20 22:46:18 +02:00
Shawn Buckley
49e6015068 Replace GT_Values.T/F with java primitive boolean values 2015-10-19 20:48:52 -04:00
Shawn Buckley
7150103150 Replace homegrown character comparision for builtin ones 2015-10-19 19:49:28 -04:00
Shawn Buckley
85c804fa11 Move source directory 2015-10-18 23:04:39 -04:00