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
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
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
MauveCloud
9036858017
Improved output bus handling
2016-04-27 17:31:20 -07:00
Blood-Asp
5c8eec846d
Merge pull request #493 from Muramasa-/TurbineCasingRebalance
...
Turbine casing rebalance
2016-04-27 21:18:29 +02:00
Blood-Asp
fd99216b35
Merge pull request #497 from MauveCloud/experimental
...
Added Crop Calculator support.
2016-04-27 21:18:05 +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
Blood-Asp
150aed2f84
Merge pull request #482 from draknyte1/UpToDateGTPRBranch
...
Changes Soft Hammer -> Soft Mallet & Flips Icon. Makes them easier to differ now.
2016-04-11 13:41:51 +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
Blood-Asp
a04b7f5159
Merge pull request #473 from leagris/experimental
...
Fix #472 #219
2016-04-04 21:53:58 +02: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
ff4cfa3933
Update buildscript to add NC2
2016-03-27 19:41:23 +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
