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
Dream-Master
bc0ec20f89
Change recipes for Sensors and Field Generators
2016-08-05 22:57:00 +02:00
Dream-Master
5894cb1e64
Change Emitter Recipes and Fix #649
2016-08-05 00:15:56 +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
Dream-Master
9418bc0954
Merge remote-tracking branch 'upstream/SmoothTransition' into experimental
...
Conflicts:
src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ElectricBlastFurnace.java
src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_MultiFurnace.java
2016-07-27 17:23:49 +02:00
Muramasa
50b9138321
Use GameRegistry
2016-07-27 17:18:10 +02:00
Muramasa
54d3a79809
a1a25d42dd
2016-07-27 17:17:58 +02:00
Blood-Asp
654efd8a25
Handle fuel value as integer
2016-07-27 17:07:14 +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
Dream-Master
05c272a5ec
Put code to GT from Core Mod
2016-07-26 22:23:57 +02:00
Dream-Master
5b9614944a
Emitter in GT Code
2016-07-26 21:09:04 +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
OneEyeMaker
cda6044614
c4bd35d7cd
2016-07-26 17:07:31 +02: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
96e9d081b1
13caf1d699
2016-07-25 23:16:43 +02:00
OneEyeMaker
90aa3b51a7
4aaafe53f5
2016-07-25 23:11:56 +02:00
OneEyeMaker
1f1664152c
47ce855868
2016-07-25 22:55:51 +02:00
OneEyeMaker
d0396c268c
f98e51a82f
2016-07-25 22:53:13 +02:00
OneEyeMaker
aca07ff36e
ea5305f7df
2016-07-25 22:51:10 +02:00
OneEyeMaker
6121acb843
8bf5b61dea
2016-07-25 22:48:54 +02:00
OneEyeMaker
f365377332
ce1e6917e0
2016-07-25 22:45:30 +02:00
OneEyeMaker
718d28bd23
ea5305f7df
2016-07-25 22:36:29 +02:00
OneEyeMaker
0fb3329176
8bf5b61dea
2016-07-25 22:32:25 +02:00
OneEyeMaker
e3d5764684
ce1e6917e0
2016-07-25 22:29:30 +02:00
OneEyeMaker
218d45c99d
b780ef6c2c
2016-07-25 22:23:13 +02:00
OneEyeMaker
49c063f24a
c9bc17bce5
2016-07-25 22:18:51 +02: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
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
