aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech/api/enums
AgeCommit message (Collapse)Author
2017-07-25add galena to the Mercury increase TagDream-Master
2017-07-25Merge branch 'GTNHexperimental' into experimental-testDream-Master
2017-07-25Increase the output chance when washing crushed Silver Ore with Mercury 70% ↵Dream-Master
=>100%
2017-07-24change ids from 614-620 because of the Ash changes ids were already used.Dream-Master
2017-07-24cherry pickDream-Master
https://github.com/Blood-Asp/GT5-Unofficial/pull/1170 4995bc3a4e9a60987d121a09a91e856a9d97be82 beaa54eb4153e11935f6107d53272c88453e3e3d 8fa91db261def5087ff4dcf25de899de36457a98 f95d89a5e6b1ab6b3e7fab5e56f9b51e21ae78e3 f816fbbd97e8440b346e73f266ec4c452d518e77 a687bcd24ee1ff97ad6d86f84f1748e1cd0129a4 306160fb69b41376644d793803c67b85bc125af3 480f2f1413989cd155fa19310d5b6f8871c8ce6e a0c6ec45daf3203b32f0d31baef93217eb2feaf0
2017-07-24added sub tags to Infinity, Infinity catalyst and cosmic neutroniumDream-Master
2017-07-24Added more material parts to Infinity and Infinity Catalyst. Add Cosmic ↵Dream-Master
Neutronium from Avaritia to the material list
2017-07-23Cherry PickJohannes Gäßler
29efe8ea5d3dffbf202960b3dd66487bbd6717fe Fixed Salt processing recipes SaltWater now yields the same amount of material as Salt Dust. Increased the energy cost of electrolyzing Salt to make netto energy yield via NaOH+Hydrogen negative.
2017-07-21Revert "remove gt obsidian"Dream-Master
This reverts commit c70ec3d1071b60eb14dac27aefc6cf4a12efea0b.
2017-07-21remove gt obsidianDream-Master
2017-07-20remove EV and IV Miner because to op and no one would use Ore Drill plantsDream-Master
2017-07-20Add more miner tiers EV and IVDream-Master
2017-07-20Add HV MinerDream-Master
2017-07-16Fixed a bug where Brick, and Fireclay had the wrong texture sets.Dream-Master
The above materials originally had the ROUGH texture. I tested what they would look like with the DULL texture and I forgot to revert it afterwards. cherry pick 9db52423cc71e3f5aae263390ed923b940f25dcf
2017-07-16Ash rebalance #1159Johannes Gäßler
cherry pick 5a8da3da9002791e5800648243bcbf1b918e09e7 ffac667541b8962fe6b2df650b64fa3948ac4222 85a921eb84a886177d719486ae0a7fc143503bb8 184774c7f1dfed2ada2d7b804c145409d3c2e26d
2017-07-16fix derpDream-Master
2017-07-09Carbon ingots #1632Dream-Master
https://github.com/GTNewHorizons/NewHorizons/issues/1632
2017-07-09cherry pickDream-Master
26e8f2337fef692384a8513d335478a68cf31a5f Fix another 2 formulas #1148
2017-07-08Light fuel produces to much energy #1634Dream-Master
https://github.com/GTNewHorizons/NewHorizons/issues/1634
2017-07-06cherry pickDream-Master
424b356feeb02cb3735b928b4b16fdf54631bcae 835dd2daccc5894a40b75a2110911a8c3e1878b9 98e214b873840c97778bb5bf5377673f76fd457d 0334a19993931a421376ce3aad50191edff3814b 0375e11debad5b9c997a91da3d07f85e37dc0616 480132b25f85bb350b04e949174ebc9ade85f185 Added LV and MV miners. #1142
2017-07-02cherry pickDream-Master
Assembly line upgrade #1130 @Antifluxfield can you review this changes. Thanks
2017-07-02cherry pickJohannes Gäßler
Item Distributor #1132
2017-06-29Fixed 2 formulas #1122Dream-Master
2017-06-29Cleanup materials whitespace.Technus
2017-06-27cherry pickJohannes Gäßler
4061f8f397d40fb3a4e363d86f47bd631a2da539 Corrected Plutonium Isotope: 244 -> 239
2017-06-24cherry pickJohannes Gäßler
c0c498fb8cec35d35cc5fd2b8524cd5510082a9b Added Bricked BF config, fixed Primitive BF class hierarchy Blast Furnace Recipes using Coal or Charcoal now yield Dark Ash instead of Ash.
2017-06-23Add new Circuit PartsDream-Master
2017-06-23hopfully fixedDream-Master
https://github.com/GTNewHorizons/NewHorizons/issues/1550 Missing Item Name #1550
2017-06-23Cherry PickJohannes Gäßler
41b93ae85dfe8e15f7d46a09cb49b65991901fed RedAlloy, TungstenCarbide now have the correct formula. Changed the formula of Lignite, it no longer contains Ash Fixed the algorithm for determining whether or not to put brackets around a partial Material.
2017-06-20Circuit Assembler progression #1541Dream-Master
https://github.com/GTNewHorizons/NewHorizons/issues/1541
2017-06-19Merge remote-tracking branch 'Petrochemy/BrickedBlastFurnace' into ↵Dream-Master
BrickedBlastFurnace
2017-06-17Implemented crafting recipes for the Bricked Blast FurnaceJohannes Gäßler
fixed Glass Hammering consuming 40x more energy than intended Fixed Hammer recipes that (presumably unintentionally) had 10EUt, 16 ticks instead of 16EUt, 10 ticks. Renamed Dense Bricks -> Firebricks
2017-06-17Optimize importsTechnus
2017-06-17Merge branch 'unstable_BLOOD' into reMergeTechnus
# Conflicts: # src/main/java/gregtech/api/enums/ItemList.java # src/main/java/gregtech/api/enums/Textures.java # src/main/java/gregtech/api/gui/GT_GUIContainer_MultiMachine.java # src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_MultiBlockBase.java # src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_AssemblyLine.java # src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OreDrillingPlant1.java # src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OreDrillingPlant4.java # src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OreDrillingPlantBase.java # src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java # src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java
2017-06-17Merge pull request #1074 from Techlone/advminer2_improvementsBlood-Asp
AdvMiner2 renamed; new tiers of OreDrillingPlant
2017-06-17Merge remote-tracking branch 'GT5-Unofficial-Fork/ChemistryUpdate' intoJohannes Gäßler
BrickedBlastFurnace Conflicts: src/main/java/gregtech/api/enums/Materials.java src/main/java/gregtech/api/enums/Textures.java src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_BronzeBlastFurnace.java src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java
2017-06-16Things cleanupTechnus
2017-06-15Fix to buildable stateTechnus
2017-06-15Merge branch 'experimental' into reMergeTechnus
# Conflicts: # build.properties # src/main/java/gregtech/api/enums/ItemList.java # src/main/java/gregtech/api/gui/GT_GUIContainer_MultiMachine.java # src/main/java/gregtech/api/metatileentity/MetaPipeEntity.java # src/main/java/gregtech/common/GT_Proxy.java # src/main/java/gregtech/common/GT_RecipeAdder.java # src/main/java/gregtech/common/items/GT_MetaGenerated_Item_01.java # src/main/java/gregtech/common/items/GT_MetaGenerated_Item_03.java # src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_Cleanroom.java # src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java # src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java # src/main/java/gregtech/nei/GT_NEI_DefaultHandler.java # src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/90.png # src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/96.png
2017-06-15Merge branch 'unstable_BLOOD' into reMergeTechnus
# Conflicts: # build.properties # src/main/java/gregtech/GT_Mod.java # src/main/java/gregtech/api/enums/ItemList.java # src/main/java/gregtech/common/GT_Network.java # src/main/java/gregtech/common/GT_Proxy.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_EnergyOnly.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_RedstoneSignalizer.java # src/main/java/gregtech/common/covers/GT_Cover_RedstoneWirelessBase.java # src/main/java/gregtech/common/covers/GT_Cover_Shutter.java # src/main/java/gregtech/common/items/GT_MetaGenerated_Item_01.java # src/main/java/gregtech/common/items/GT_MetaGenerated_Item_03.java # src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_Cleanroom.java # src/main/java/gregtech/common/tools/GT_Tool.java # src/main/java/gregtech/common/tools/GT_Tool_Axe.java # src/main/java/gregtech/common/tools/GT_Tool_Chainsaw_LV.java # src/main/java/gregtech/loaders/misc/GT_CoverLoader.java # src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java # src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java # src/main/java/gregtech/nei/GT_NEI_DefaultHandler.java
2017-06-15Merge branch 'unstable_BLOOD' into reMergeTechnus
# Conflicts: # build.properties # src/main/java/gregtech/GT_Mod.java # src/main/java/gregtech/api/enums/Textures.java # src/main/java/gregtech/api/gui/GT_GUIContainer_MultiMachine.java # src/main/java/gregtech/api/interfaces/tileentity/IEnergyConnected.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/MetaPipeEntity.java # src/main/java/gregtech/api/metatileentity/MetaTileEntity.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/objects/GT_UO_DimensionList.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_UndergroundOil.java # src/main/java/gregtech/common/GT_Worldgenerator.java # src/main/java/gregtech/common/blocks/GT_Block_Machines.java # src/main/java/gregtech/common/blocks/GT_Material_Casings.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_EnergyOnly.java # src/main/java/gregtech/common/covers/GT_Cover_PlayerDetector.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_RedstoneReceiverInternal.java # src/main/java/gregtech/common/covers/GT_Cover_RedstoneSignalizer.java # src/main/java/gregtech/common/covers/GT_Cover_RedstoneWirelessBase.java # src/main/java/gregtech/common/covers/GT_Cover_Shutter.java # src/main/java/gregtech/common/covers/GT_Cover_Vent.java # src/main/java/gregtech/common/gui/GT_Container_ChestBuffer.java # src/main/java/gregtech/common/gui/GT_Container_Filter.java # src/main/java/gregtech/common/gui/GT_Container_SuperBuffer.java # src/main/java/gregtech/common/gui/GT_Container_TypeFilter.java # src/main/java/gregtech/common/items/behaviors/Behaviour_None.java # src/main/java/gregtech/common/items/behaviors/Behaviour_Prospecting.java # src/main/java/gregtech/common/tileentities/boilers/GT_MetaTileEntity_Boiler_Steel.java # src/main/java/gregtech/common/tileentities/generators/GT_MetaTileEntity_LightningRod.java # src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_MicrowaveEnergyTransmitter.java # src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Teleporter.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_DistillationTower.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_OilDrill.java # src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ProcessingArray.java # src/main/java/gregtech/loaders/load/GT_FuelLoader.java # src/main/java/gregtech/loaders/misc/GT_CoverLoader.java # src/main/java/gregtech/loaders/oreprocessing/ProcessingPlate.java # src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java # src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java # src/main/java/gregtech/nei/GT_NEI_DefaultHandler.java
2017-06-15change materials back to old burn vauluesDream-Master
2017-06-15Merge remote-tracking branch 'origin/unstable' into ChemistryUpdateJohannes Gäßler
Conflicts: src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_Cleanroom.java src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeBoiler.java src/main/java/gregtech/loaders/load/GT_FuelLoader.java src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java src/main/java/gregtech/nei/GT_NEI_DefaultHandler.java
2017-06-15cherry pickDream-Master
7f408ff581b25fdee81e87c61e124c48f25ee78e Returned BioFuel to its previous state, added BioDiesel instead. There are artifacts for fluids called BioFuel, therefore the change.
2017-06-14cherry pickDream-Master
1b753d3528c7a149c23838eb3c4ce0d8f55036a6 Reworking DataOrb and DataStick
2017-06-13Reworking DataOrb and DataStickTechlone
2017-06-13change Naphtha and Light Fuel back to the burn values from 1.4.1.1Dream-Master
2017-06-10rename BioFuel to BioDieselDream-Master
add Circuits to chemical reactor recipes
2017-06-10Added a Recipe Map for Primitive Blast FurnacesJohannes Gäßler
The Recipe Map is not yet in use.
2017-06-10remove old Nitric acidDream-Master
generated by cgit (git 2.46.0) at 2025-03-06 14:59:50 +0000