Commit graph

235 commits

Author SHA1 Message Date
Dream-Master
f16c888309 bump version 2017-05-12 23:27:56 +02:00
Dream-Master
946ac48e46 fic Gears and Rings
bump version
2017-05-07 23:16:11 +02:00
Dream-Master
b990b43915 bump version 2017-05-07 11:26:16 +02:00
Dream-Master
9545f8f232 fix recipe basic circuit
machine recipe loader file was to large. I divided it again @Technus  are this ok or did i derp here?
2017-04-30 21:42:54 +02:00
Dream-Master
22f0af1b72 change circuits parts a bit. 2017-04-28 23:13:57 +02:00
Technus
929073a7ae Merge branch 'experimental' from GTNH into mergeGTNH (based on BLOODASP)
# Conflicts:
# 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/Textures.java
# src/main/java/gregtech/api/enums/Tier.java
# src/main/java/gregtech/api/items/GT_MetaGenerated_Tool.java
# src/main/java/gregtech/api/metatileentity/BaseMetaTileEntity.java
# src/main/java/gregtech/api/metatileentity/implementations/GT_MetaPipeEntity_Fluid.java
# src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicGenerator.java
# src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicMachine.java
# src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Maintenance.java
# src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Muffler.java
# src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_MultiBlockBase.java
# src/main/java/gregtech/api/util/GT_ModHandler.java
# src/main/java/gregtech/api/util/GT_Recipe.java
# src/main/java/gregtech/api/util/GT_RecipeRegistrator.java
# src/main/java/gregtech/api/util/GT_Utility.java
# src/main/java/gregtech/common/GT_Client.java
# src/main/java/gregtech/common/GT_Pollution.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_Worldgenerator.java
# src/main/java/gregtech/common/blocks/GT_Block_Casings3.java
# src/main/java/gregtech/common/blocks/GT_Block_Casings_Abstract.java
# src/main/java/gregtech/common/blocks/GT_Block_Machines.java
# src/main/java/gregtech/common/blocks/GT_Block_Stones_Abstract.java
# src/main/java/gregtech/common/blocks/GT_Item_Machines.java
# src/main/java/gregtech/common/blocks/GT_Item_Ores.java
# src/main/java/gregtech/common/blocks/GT_TileEntity_Ores.java
# src/main/java/gregtech/common/covers/GT_Cover_FluidRegulator.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/gui/GT_Container_Regulator.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_Item_03.java
# src/main/java/gregtech/common/items/GT_MetaGenerated_Tool_01.java
# src/main/java/gregtech/common/items/armor/ArmorData.java
# src/main/java/gregtech/common/items/armor/GuiElectricArmor1.java
# src/main/java/gregtech/common/items/armor/ModularArmor_Item.java
# src/main/java/gregtech/common/items/armor/Values.java
# src/main/java/gregtech/common/items/armor/gui/GuiModularArmor.java
# src/main/java/gregtech/common/items/armor/gui/InventoryArmor.java
# src/main/java/gregtech/common/items/behaviors/Behaviour_Plunger_Fluid.java
# src/main/java/gregtech/common/items/behaviors/Behaviour_Sense.java
# src/main/java/gregtech/common/tileentities/automation/GT_MetaTileEntity_Regulator.java
# src/main/java/gregtech/common/tileentities/automation/GT_MetaTileEntity_TypeFilter.java
# src/main/java/gregtech/common/tileentities/boilers/GT_MetaTileEntity_Boiler_Bronze.java
# src/main/java/gregtech/common/tileentities/boilers/GT_MetaTileEntity_Boiler_Lava.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_SolidNaquadahReactor.java
# src/main/java/gregtech/common/tileentities/generators/GT_MetaTileEntity_SteamTurbine.java
# src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_AdvSeismicProspector.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_Replicator.java
# src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Scanner.java
# src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Teleporter.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_Charcoal_Pit.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_LargeTurbine.java
# src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_Gas.java
# src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_Plasma.java
# src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_Steam.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_VacuumFreezer.java
# src/main/java/gregtech/common/tileentities/machines/steam/GT_MetaTileEntity_Compressor_Bronze.java
# src/main/java/gregtech/common/tileentities/machines/steam/GT_MetaTileEntity_Compressor_Steel.java
# src/main/java/gregtech/common/tileentities/machines/steam/GT_MetaTileEntity_Extractor_Bronze.java
# src/main/java/gregtech/common/tileentities/machines/steam/GT_MetaTileEntity_Extractor_Steel.java
# src/main/java/gregtech/common/tileentities/machines/steam/GT_MetaTileEntity_Macerator_Steel.java
# src/main/java/gregtech/common/tools/GT_Tool_Scoop.java
# src/main/java/gregtech/loaders/load/GT_FuelLoader.java
# src/main/java/gregtech/loaders/misc/GT_Achievements.java
# src/main/java/gregtech/loaders/oreprocessing/ProcessingBlock.java
# src/main/java/gregtech/loaders/oreprocessing/ProcessingCircuit.java
# src/main/java/gregtech/loaders/oreprocessing/ProcessingDust.java
# src/main/java/gregtech/loaders/oreprocessing/ProcessingDustSmall.java
# src/main/java/gregtech/loaders/oreprocessing/ProcessingDustTiny.java
# src/main/java/gregtech/loaders/oreprocessing/ProcessingGemExquisite.java
# src/main/java/gregtech/loaders/oreprocessing/ProcessingGemFlawless.java
# src/main/java/gregtech/loaders/oreprocessing/ProcessingNugget.java
# src/main/java/gregtech/loaders/oreprocessing/ProcessingOre.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
# src/main/java/gregtech/loaders/oreprocessing/ProcessingPlate1.java
# src/main/java/gregtech/loaders/oreprocessing/ProcessingPlate2.java
# src/main/java/gregtech/loaders/oreprocessing/ProcessingPlate3.java
# src/main/java/gregtech/loaders/oreprocessing/ProcessingPlate4.java
# src/main/java/gregtech/loaders/oreprocessing/ProcessingPlate5.java
# src/main/java/gregtech/loaders/oreprocessing/ProcessingStickLong.java
# src/main/java/gregtech/loaders/oreprocessing/ProcessingToolHeadBuzzSaw.java
# src/main/java/gregtech/loaders/oreprocessing/ProcessingToolHeadChainsaw.java
# src/main/java/gregtech/loaders/oreprocessing/ProcessingToolHeadDrill.java
# src/main/java/gregtech/loaders/oreprocessing/ProcessingToolHeadFile.java
# src/main/java/gregtech/loaders/oreprocessing/ProcessingToolHeadHammer.java
# src/main/java/gregtech/loaders/oreprocessing/ProcessingToolHeadWrench.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/oreprocessing/ProcessingWire16.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_Worldgenloader.java
# src/main/java/gregtech/loaders/preload/GT_Loader_ItemData.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_OreProcessing.java
# src/main/java/gregtech/nei/GT_NEI_DefaultHandler.java
# src/main/resources/assets/gregtech/textures/items/gt.Double_Naquadahcell.png
# src/main/resources/assets/gregtech/textures/items/gt.Double_NaquadahcellDep.png
# src/main/resources/assets/gregtech/textures/items/gt.Naquadahcell.png
# src/main/resources/assets/gregtech/textures/items/gt.NaquadahcellDep.png
# src/main/resources/assets/gregtech/textures/items/gt.Quad_Naquadahcell.png
# src/main/resources/assets/gregtech/textures/items/gt.Quad_NaquadahcellDep.png
2017-04-27 17:06:22 +02:00
Dream-Master
8d539f2e54 change Energy Crystal recipe a bit. 2017-04-17 23:02:55 +02:00
Dream-Master
e8a332aa76 Good Circuits recipes are to cheap. Will add the change into Quests. 2017-04-04 17:00:11 +02:00
Blood-Asp
6f5e16b286 Updated Achievements to fit changed circuits 2017-04-01 01:03:52 +02:00
Dream-Master
8cb67c05f7 bump version 2017-03-31 18:19:40 +02:00
Dream-Master
73629059c9 Add Ichorium as a material to GT Code 2017-03-26 12:34:05 +02:00
Blood-Asp
1443cb6141 Alternative superbuffer recipe with datasticks 2017-03-23 13:59:16 +01:00
Dream-Master
40f10c2cab bump version 2017-03-18 16:00:59 +01:00
Dream-Master
515234aac0 Add yamcore to gradle 2017-03-15 19:36:50 +01:00
Dream-Master
bed07999bd Basic Item Filter recipe change #1203 https://github.com/GTNewHorizons/NewHorizons/issues/1203 2017-03-13 21:32:41 +01:00
Dream-Master
4c8cad9230 Add new Plastic recipe https://github.com/GTNewHorizons/NewHorizons/issues/1137 2017-03-10 20:17:02 +01:00
Dream-Master
36eea25d7d Change Lubricant recipes a bit 2017-03-10 18:46:44 +01:00
Dream-Master
f83525ecd5 bump version 2017-03-08 21:28:15 +01:00
Blood-Asp
48d7a1ee5d Fix rubber plates in modular armor boots 2017-03-08 17:52:28 +01:00
Dream-Master
cbe4e35d93 bump version 2017-03-07 19:09:50 +01:00
Blood-Asp
7bae02b0ed Remove original IC2 adv circuit recipe. 2017-03-05 21:50:10 +01:00
Dream-Master
488c959791 material change 2017-03-04 14:15:43 +01:00
Dream-Master
4f8db15e19 bump vserion 2017-03-03 16:53:39 +01:00
Dream-Master
e326f2cd72 bump version 2017-02-28 10:35:37 +01:00
Blood-Asp
4e043f617b Circuit changes 2017-02-28 02:04:47 +01:00
Dream-Master
f51e65e169 bump version and remove Field generators recipes 2017-02-26 23:31:40 +01:00
Dream-Master
899f056dc4 bump version 2017-02-26 22:35:40 +01:00
Dream-Master
cb4cdf7a05 missing files 2017-02-24 01:40:57 +01:00
Dream-Master
75d39b898f bump version 2017-02-23 17:35:28 +01:00
Dream-Master
8893a85ebb Fix Energetic Alloy be a few Tiers lower
https://github.com/GTNewHorizons/NewHorizons/issues/1103
2017-02-14 18:11:49 +01:00
Dream-Master
dd1950a707 bump version 2017-02-11 15:17:00 +01:00
Blood-Asp
b6674c9d96 Finish Cleanroom 2017-02-11 01:04:46 +01:00
Dream-Master
c2afb4b256 rework Rail recipes a bit. 2017-02-05 14:13:21 +01:00
Dream-Master
1ec6bd84ce grindy but not make sense = now grindy but make sense :) 2017-02-04 10:28:25 +01:00
Dream-Master
dd65e4c5e8 change Biogas recipe to 1000l out at mv
https://github.com/GTNewHorizons/NewHorizons/issues/1074
2017-02-02 15:32:58 +01:00
Dream-Master
c3604442f7 bump version 2017-01-29 22:30:05 +01:00
Dream-Master
efee567c36 change BioGas a bit because it was over-nerfed
approved by @Drobac
2017-01-23 22:42:28 +01:00
Technus
a1f44b9ca9 bump version 2017-01-21 14:27:50 +01:00
Dream-Master
74b8b157c2 bump version. 2017-01-20 21:07:20 +01:00
Dream-Master
aba425deec bump version 2017-01-18 10:32:51 +01:00
Dream-Master
36963d700c bump version 2017-01-15 14:35:37 +01:00
Dream-Master
3cfbbae1b7 bump version 2017-01-14 22:58:06 +01:00
Dream-Master
b80323a04c This works better. remove Bio Chaff out of the macerator 2017-01-14 19:44:31 +01:00
Dream-Master
48db0ef366 remove IC2 Bio Chaff recipes 2017-01-14 13:39:24 +01:00
Dream-Master
739a7c7bf7 bump version 2017-01-14 11:05:52 +01:00
Dream-Master
244174e2fd bump version 2017-01-13 15:29:52 +01:00
Dream-Master
4cc2a9dcc6 bump version 2017-01-12 08:14:03 +01:00
Dream-Master
d7af401006 fix #965
Blood infused iron plates for glass dagger of sacrafice cant be crafted
2017-01-08 19:27:10 +01:00
Dream-Master
facd22b08e bump version 2017-01-05 20:04:32 +01:00
Dream-Master
e95ec79a0f bump version 2017-01-05 19:20:54 +01:00