Dream-Master
|
20572d5678
|
Change some materials.
|
2016-08-05 16:16:19 +02:00 |
|
Dream-Master
|
5efb45aa2d
|
Remove Low and High Pressure Boiler from RC and add it to the Core Mod
|
2016-08-05 15:18:16 +02:00 |
|
Dream-Master
|
6e0081a170
|
Added Low and High Pressure Boiler from RC to the code new try
|
2016-08-05 10:55:56 +02:00 |
|
Dream-Master
|
c6245c56dc
|
Added Low and High Pressure Boiler from RC to the code( Crafting Recipe and Assembler Recipe )
|
2016-08-05 10:33:43 +02:00 |
|
Dream-Master
|
e6c4150cd9
|
Change Blast Furnace Temp a bit
|
2016-08-05 09:44:02 +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
|
52a23cc3b7
|
bump version
|
2016-07-27 17:24:11 +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 |
|
Dream-Master
|
36825da884
|
bump version
|
2016-07-27 17:19:33 +02:00 |
|
Dream-Master
|
da213797ac
|
Merge remote-tracking branch 'upstream/Fixes' into experimental
Conflicts:
src/main/java/gregtech/GT_Mod.java
|
2016-07-27 17:19:10 +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 |
|
Dream-Master
|
e9cae4d26a
|
bump Version
|
2016-07-27 17:12:22 +02:00 |
|
Dream-Master
|
b02f970ae4
|
Merge remote-tracking branch 'upstream/experimental' into experimental
|
2016-07-27 17:10:30 +02:00 |
|
Blood-Asp
|
654efd8a25
|
Handle fuel value as integer
|
2016-07-27 17:07:14 +02:00 |
|
Draknyte1
|
55bf454318
|
Makes GT Sound volume adjustable via proper sliders.
|
2016-07-27 17:06:18 +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 |
|
OneEyeMaker
|
fa1955f6e5
|
Merge pull request #4 from Blood-Asp/experimental
Update changes
|
2016-07-27 07:05:14 +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 |
|
Blood-Asp
|
cabd521afe
|
Merge pull request #582 from draknyte1/FixSoundsSliders
Makes GT Sound volume adjustable via proper sliders.
|
2016-07-27 01:51:54 +02:00 |
|
Draknyte1
|
dafe88d8e8
|
Makes GT Sound volume adjustable via proper sliders.
|
2016-07-27 07:46:59 +10:00 |
|
Dream-Master
|
73c63314ff
|
bump Version
|
2016-07-26 22:24:42 +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
|
c71fe0c9a8
|
bump Version
|
2016-07-26 19:44:54 +02:00 |
|
Dream-Master
|
a1bc16ae70
|
Merge branch 'new-features' into experimental
|
2016-07-26 19:43:29 +02:00 |
|
Dream-Master
|
7a872dfad2
|
Merge remote-tracking branch 'upstream/NewFeatures' into new-features
|
2016-07-26 19:41:49 +02:00 |
|
OneEyeMaker
|
9c788fa292
|
Restored TextureSets
|
2016-07-26 20:02:41 +03:00 |
|
Dream-Master
|
1512c3cdce
|
fixes
|
2016-07-26 18:30:30 +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
|
c014ae4afc
|
Fixed merge conflicts.
|
2016-07-26 17:10:23 +02:00 |
|
OneEyeMaker
|
cda6044614
|
c4bd35d7cd
|
2016-07-26 17:07:31 +02: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
|
4c20885d14
|
Merge pull request #3 from Blood-Asp/experimental
Update changes
|
2016-07-26 07:42:29 +03:00 |
|
OneEyeMaker
|
c4bd35d7cd
|
Coils should be deprecated
|
2016-07-26 07:31:57 +03:00 |
|
Blood-Asp
|
3abf4381db
|
Merge pull request #580 from Muramasa-/Fixes
Separated multiblock overlay and gui textures
|
2016-07-26 01:57:27 +02:00 |
|
Muramasa
|
16cac26b72
|
Separated multiblock overlay and gui textures
|
2016-07-26 00:52:30 +01:00 |
|