Dream-Master
|
5a35be495e
|
change Materials a bit
Some Metallurgy Metal adds
|
2016-08-23 22:57:31 +02:00 |
|
Blood-Asp
|
cff73fd5a3
|
#573 Turbines now explode when producing more EU than dynamo can handle
|
2016-08-23 18:42:23 +02:00 |
|
Dream-Master
|
1fc13df510
|
spell fix
|
2016-08-23 18:24:41 +02:00 |
|
Dream-Master
|
9fa6c9a40e
|
Add new Materials
|
2016-08-18 14:58:26 +02:00 |
|
Dream-Master
|
d57c26a2a1
|
make adamantium ebf furnace required
|
2016-08-14 23:05:24 +02:00 |
|
Dream-Master
|
ee007402d8
|
added new recipe to Compressed Plates.
|
2016-08-10 23:12:09 +02:00 |
|
Dream-Master
|
a944901807
|
some Material changes
|
2016-08-08 23:07:59 +02:00 |
|
Dream-Master
|
cf98730762
|
Adding Missing Materials to GT for Galaxy Space 1.10 Compat 2.6
|
2016-08-08 23:04:16 +02:00 |
|
Dream-Master
|
bc0ec20f89
|
Change recipes for Sensors and Field Generators
|
2016-08-05 22:57:00 +02:00 |
|
Dream-Master
|
20572d5678
|
Change some materials.
|
2016-08-05 16:16:19 +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 |
|
Blood-Asp
|
654efd8a25
|
Handle fuel value as integer
|
2016-07-27 17:07:14 +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
|
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
|
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 |
|
Dream-Master
|
0dc0085f6f
|
final fixes
|
2016-07-25 23:20:48 +02:00 |
|
OneEyeMaker
|
96e9d081b1
|
13caf1d699
|
2016-07-25 23:16:43 +02:00 |
|
OneEyeMaker
|
90aa3b51a7
|
4aaafe53f5
|
2016-07-25 23:11:56 +02:00 |
|
OneEyeMaker
|
9575e565fd
|
b3279513a3
|
2016-07-25 23:03:52 +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
|
18ab1c12cc
|
Naquadah should be more expensive.
|
2016-07-25 22:32:51 +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
|
b3777e1eca
|
Now Naquadria (source of Neutronium) requires highest tier of heating coils.
|
2016-07-25 22:23:38 +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
|
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 |
|
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
|
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 |
|