Blood-Asp
654efd8a25
Handle fuel value as integer
2016-07-27 17:07:14 +02:00
Dream-Master
2efe1b9f51
Merge remote-tracking branch 'upstream/NewFeatures' into new-features
...
Conflicts:
.gitignore
build.properties
src/main/java/gregtech/GT_Mod.java
src/main/java/gregtech/api/enums/ItemList.java
src/main/java/gregtech/api/enums/Materials.java
src/main/java/gregtech/api/enums/OrePrefixes.java
src/main/java/gregtech/api/interfaces/internal/IGT_RecipeAdder.java
src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicMachine_GT_Recipe.java
src/main/java/gregtech/api/util/GT_BaseCrop.java
src/main/java/gregtech/api/util/GT_Recipe.java
src/main/java/gregtech/common/GT_Proxy.java
src/main/java/gregtech/common/GT_RecipeAdder.java
src/main/java/gregtech/common/GT_Worldgen_GT_Ore_Layer.java
src/main/java/gregtech/common/GT_Worldgen_GT_Ore_SmallPieces.java
src/main/java/gregtech/common/GT_Worldgen_Stone.java
src/main/java/gregtech/common/GT_Worldgenerator.java
src/main/java/gregtech/common/blocks/GT_Block_Casings1.java
src/main/java/gregtech/common/blocks/GT_Block_Casings2.java
src/main/java/gregtech/common/blocks/GT_Block_Concretes.java
src/main/java/gregtech/common/blocks/GT_Block_Machines.java
src/main/java/gregtech/common/blocks/GT_Block_Ores.java
src/main/java/gregtech/common/blocks/GT_Block_Reinforced.java
src/main/java/gregtech/common/blocks/GT_Item_Casings1.java
src/main/java/gregtech/common/blocks/GT_Item_Casings_Abstract.java
src/main/java/gregtech/common/blocks/GT_TileEntity_Ores.java
src/main/java/gregtech/common/covers/GT_Cover_Arm.java
src/main/java/gregtech/common/covers/GT_Cover_ControlsWork.java
src/main/java/gregtech/common/covers/GT_Cover_Conveyor.java
src/main/java/gregtech/common/covers/GT_Cover_DoesWork.java
src/main/java/gregtech/common/covers/GT_Cover_Drain.java
src/main/java/gregtech/common/covers/GT_Cover_EUMeter.java
src/main/java/gregtech/common/covers/GT_Cover_Fluidfilter.java
src/main/java/gregtech/common/covers/GT_Cover_ItemMeter.java
src/main/java/gregtech/common/covers/GT_Cover_Pump.java
src/main/java/gregtech/common/covers/GT_Cover_RedstoneConductor.java
src/main/java/gregtech/common/covers/GT_Cover_RedstoneTransmitterInternal.java
src/main/java/gregtech/common/covers/GT_Cover_Shutter.java
src/main/java/gregtech/common/gui/GT_Container_Filter.java
src/main/java/gregtech/common/items/GT_FluidDisplayItem.java
src/main/java/gregtech/common/items/GT_IntegratedCircuit_Item.java
src/main/java/gregtech/common/items/GT_MetaGenerated_Item_01.java
src/main/java/gregtech/common/items/GT_MetaGenerated_Item_02.java
src/main/java/gregtech/common/items/GT_MetaGenerated_Tool_01.java
src/main/java/gregtech/common/items/GT_SensorCard_Item.java
src/main/java/gregtech/common/items/ItemComb.java
src/main/java/gregtech/common/items/behaviors/Behaviour_Plunger_Fluid.java
src/main/java/gregtech/common/items/behaviors/Behaviour_Prospecting.java
src/main/java/gregtech/common/items/behaviors/Behaviour_Spray_Color.java
src/main/java/gregtech/common/tileentities/automation/GT_MetaTileEntity_TypeFilter.java
src/main/java/gregtech/common/tileentities/boilers/GT_MetaTileEntity_Boiler_Lava.java
src/main/java/gregtech/common/tileentities/boilers/GT_MetaTileEntity_Boiler_Solar.java
src/main/java/gregtech/common/tileentities/boilers/GT_MetaTileEntity_Boiler_Steel.java
src/main/java/gregtech/common/tileentities/generators/GT_MetaTileEntity_DieselGenerator.java
src/main/java/gregtech/common/tileentities/generators/GT_MetaTileEntity_FluidNaquadahReactor.java
src/main/java/gregtech/common/tileentities/generators/GT_MetaTileEntity_GasTurbine.java
src/main/java/gregtech/common/tileentities/generators/GT_MetaTileEntity_SolidNaquadahReactor.java
src/main/java/gregtech/common/tileentities/generators/GT_MetaTileEntity_SteamTurbine.java
src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Disassembler.java
src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Massfabricator.java
src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Scanner.java
src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_SeismicProspector.java
src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_AdvMiner2.java
src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_AssemblyLine.java
src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_BronzeBlastFurnace.java
src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_DieselEngine.java
src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ElectricBlastFurnace.java
src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ImplosionCompressor.java
src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeBoiler.java
src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeBoiler_Bronze.java
src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeBoiler_Steel.java
src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeBoiler_TungstenSteel.java
src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine.java
src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_MultiFurnace.java
src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OilCracker.java
src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OilDrill.java
src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ProcessingArray.java
src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_PyrolyseOven.java
src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_VacuumFreezer.java
src/main/java/gregtech/common/tools/GT_Tool.java
src/main/java/gregtech/common/tools/GT_Tool_Chainsaw_LV.java
src/main/java/gregtech/common/tools/GT_Tool_Drill_HV.java
src/main/java/gregtech/common/tools/GT_Tool_Drill_LV.java
src/main/java/gregtech/common/tools/GT_Tool_Sense.java
src/main/java/gregtech/common/tools/GT_Tool_Wrench.java
src/main/java/gregtech/loaders/load/GT_FuelLoader.java
src/main/java/gregtech/loaders/misc/GT_BeeDefinition.java
src/main/java/gregtech/loaders/oreprocessing/ProcessingCrushedPurified.java
src/main/java/gregtech/loaders/oreprocessing/ProcessingWire01.java
src/main/java/gregtech/loaders/oreprocessing/ProcessingWire02.java
src/main/java/gregtech/loaders/oreprocessing/ProcessingWire04.java
src/main/java/gregtech/loaders/oreprocessing/ProcessingWire08.java
src/main/java/gregtech/loaders/oreprocessing/ProcessingWire12.java
src/main/java/gregtech/loaders/postload/GT_CraftingRecipeLoader.java
src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java
src/main/java/gregtech/loaders/postload/GT_RecyclerBlacklistLoader.java
src/main/java/gregtech/loaders/postload/GT_Worldgenloader.java
src/main/java/gregtech/loaders/preload/GT_Loader_Item_Block_And_Fluid.java
src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java
src/main/java/gregtech/loaders/preload/GT_Loader_OreDictionary.java
src/main/resources/assets/gregtech/lang/en_US.lang
src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.argon.png.mcmeta
2016-07-26 18:25:35 +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
Dream-Master
3ce817dddb
More Pollution work
2016-07-04 18:41:53 +02:00
Blood-Asp
704d534b43
More Pollution work
2016-07-03 18:35:51 +02:00
Dream-Master
5de110ad42
This works
...
HeeEndium
2016-06-26 23:43:15 +02:00
Dream-Master
8a3ed09c46
Blood Asp changes
2016-06-24 01:32:57 +02:00
Blood-Asp
cea067c613
More superfuel fixes
2016-06-24 01:08:26 +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
Dream-Master
ada744c29a
d718cac331 [ d718cac]
2016-06-22 18:52:27 +02:00
Dream-Master
55c49f3021
remove Nugget to Ingot recipe.
...
If i know this before i never wrote hundreds of MT Lines
2016-06-22 17:40:58 +02:00
Dream-Master
3917d26760
91d34c2c68 [ 91d34c2]
2016-06-22 00:05:04 +02:00
Dream-Master
a88d9c4e72
experimental branch
2016-06-21 21:07:14 +02:00
Dream-Master
fafe1bcc88
reverse commit
2016-06-21 19:32:31 +02:00
Dream-Master
09add3e8ac
even with Blood asp experimental branch
2016-06-21 18:50:29 +02:00
Dream-Master
b09b54435f
remove all
2016-06-21 18:42:02 +02:00
Blood-Asp
f708fc5ff8
Corrected Wood Plates burn value
2016-06-20 00:40:00 +02:00
Blood-Asp
1ace2c4e35
Blacklist Unstable Ingots from unification
2016-06-19 17:42:43 +02:00
Dream-Master
9f8de14a9f
Change Fuel and Nitro diesel values
...
change Burn value of Lignite coal 4x
Change Gui Pic from Distillation Tower and Large Heat Exchanger (thanks to Draknyte1)
2016-05-22 02:15:51 +02:00
OneEyeMaker
5169c509d6
Added configuration file to enabling processing of ores
2016-05-18 07:41:36 +03:00
Dream-Master
df61939d03
Revert "Try to add Oil Drill. Works but not pumping oil"
...
This reverts commit 26f65443ff
2016-04-09 14:02:18 +02:00
Dream-Master
26f65443ff
Try to add Oil Drill. Works but not pumping oil
2016-04-04 22:33:30 +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
009c032c13
Hiding of Recycling recipes and unneeded ores in NEI
2016-03-20 16:47:17 +01:00
Teteros
d718cac331
Modify Wet Concrete to be able to use cells
...
Wet Concrete was lacking cell support as it was a 'molten' fluid type.
This patch adds a new type 'wet', which replaces 'molten'
for Concrete. This means with this patch you can either use
the canner with concrete dust to fill the cell, or the fluid
canning machine to input or output Wet Concrete.
Ideally Wet Concrete would be separate from Concrete as one is solid and
the other fluid, but they were kept together for compatibility with
existing recipes. 1 Concrete Cell = 144 Wet Concrete = Concrete Block
'Wet' fluid type can be used anytime you'd like both solid and fluid
cell support, as these were usually separate for good reasons.
Mostly to prevent the awkward ratio above.
2016-01-14 06:14:53 +00:00
Dream-Master
1b6f3ab64d
Revert "Fixed world event lag and related cauldron crash (LemADEC)"
...
This reverts commit 10d1e48220
2015-12-29 15:20:14 +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
Dream-Master
10d1e48220
Fixed world event lag and related cauldron crash (LemADEC)
2015-12-22 11:49:48 +01:00
Blood-Asp
a9aac6ff58
comb processing fixes
2015-12-21 19:44:23 +01:00
LemADEC
63f8506fd6
Fixed world event lag and related cauldron crash
2015-12-19 21:09:16 +01:00
Dream-Master
26c684ce02
remove this from Gt Code
2015-12-17 13:10:19 +01:00
Dream-Master
27ee4e8635
Test commit to put Core Mod Items into GT code.
2015-12-13 11:52:02 +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
Dream-Master
55ed43f4ce
Added all fixes from Blood Asp we need. Just stay at Forestry 3.6.12.3
2015-12-10 01:12:42 +01:00
Blood-Asp
8176a5fca9
cable burn fix and ihl compat fix
2015-12-08 23:39:41 +01:00
Blood-Asp
aeb505273b
Saving pumped oil amounts in chunk NBTs
2015-12-06 21:15:41 +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
Dream-Master
898a045a97
Change recipes Field generator Tier 1-5
...
Change recipes Quantum Chest Tier 1-5 (4+5 need to be redone)
Change recipes Quantum Tank Tier 1-5 (4+5 need to be redone)
Change recipes Pump Tier 4+5
2015-11-20 12:29:18 +01:00
Dream-Master
87c81f8d85
Change Name Heavy Duty Alloy Ingot T1
...
Added Damascus steel, Osmiridium and Shadow Iron to the code
Change Implosion Compressor recipe
Change Large Bronze Boiler recipes
2015-11-20 11:20:00 +01:00
Dream-Master
91d34c2c68
New Nerfed Small Gears and Ring recipes into GT code.
2015-11-20 09:41:17 +01:00
Dream-Master
c32369a8f5
Adding Colant Cells to Gt Mixer
...
Add Caesium Burn value
Add Block Harvet Level
(copy from Gt 5.09. code)
2015-11-03 12:06:55 +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
1e425e6622
Added burn values for caesium
2015-10-25 23:17:39 +01:00
Blood-Asp
0f288afe8b
Added config for block harvest levels.
2015-10-25 22:52:57 +01:00
Blood-Asp
2a08dcc756
fixed unification issue
2015-10-25 14:02:52 +01: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
