aboutsummaryrefslogtreecommitdiff
path: root/src/main/resources/assets/gregtech
AgeCommit message (Collapse)Author
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-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-16Adjusted BBF GUIs to accommodate to the new 3/3 layout.Johannes Gäßler
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-13Reworking DataOrb and DataStickTechlone
2017-06-08Implemented Bricked Blast Furnace, added corresponding texturesJohannes Gäßler
Added a new Casing for the Bricked Blast Furnace, GT_Block_Casings4, ID 15 Refactored the non-electric Blast Furnaces: The Bronze Blast Furnace and the Bricked Blast Furnace extend a superclass to ensure consistent behavior. Subclasses only differ in texture, description, and Casing Block.
2017-06-04wire/pipe hiding/reduced sizeTechnus
2017-05-15Added a GUI for the Large Chemical ReactorJohannes Gäßler
2017-05-12Merge branch 'ChemistryUpdate' into LargeChemicalReactorJohannes Gäßler
Conflicts: src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java
2017-05-09Added new textures for the LCM, using them nowJohannes Gäßler
2017-04-30Chem reactors can now output 2 items, implemented recipes for NitricJohannes Gäßler
Acid,added utility methods to get Material cells or integrated circuits, it's now possible to declare a temperature for automatically created fluids / gases
2017-04-01Updated Achievements to fit changed circuitsBlood-Asp
2017-03-15Implement #292.Dimach
2017-03-01More circuit balancingBlood-Asp
2017-02-28Merge pull request #904 from Techlone/unstableBlood-Asp
Add new semiconductors and indium recipe
2017-02-28Circuit changesBlood-Asp
2017-02-17Add new semiconductors and indium recipeTechlone
2017-02-11Finish CleanroomBlood-Asp
2016-10-22Add Naquadah fuel rods and fix some Assemblyline recipesBlood-Asp
Naquadah fuel = Mox with 10x runtime.
2016-10-19Add EnderIO Rocket Fuel compatBlood-Asp
2016-09-28Remove .bats since Curse does not like them. Take from old builds if needed.Blood-Asp
2016-07-26Merge branch 'experimental' into NewFeaturesOneEyeMaker
2016-07-26Coils should be deprecatedOneEyeMaker
2016-07-26Separated multiblock overlay and gui texturesMuramasa
2016-07-24Redesigned achievements.OneEyeMaker
2016-07-22Various fixes/cleanupMuramasa
Game will no longer crash without UBC loaded Added missing mallet textures to materialicon Lignite
2016-07-21Redefined some wires. Added last heating coil block.OneEyeMaker
2016-07-20Added new tier of heating coils.OneEyeMaker
//TODO: Find material for LuV coils.
2016-07-18Restored broken compatibility.OneEyeMaker
2016-07-17Updated tooltipsOneEyeMaker
2016-07-17Added new heating coil blocks.OneEyeMaker
2016-07-16InitialMuramasa
This is more of a test and resource for when I eventually rewrite the GT5U ore texture/metadata system.
2016-07-01Small fixes and rebalancesBlood-Asp
2016-07-01First Assemblyline recipesBlood-Asp
2016-07-01Adding LuV, ZPM and UV componentsBlood-Asp
2016-06-23Add new Fuel, Fix emitter and field gen recipes, add charcoal/lignite block ↵Blood-Asp
fuel values
2016-06-23Changed Field Generator recipesBlood-Asp
2016-06-21Bug fixes for my commitsMuramasa
Removed commented out old turbine texture code Fixed Diesel Engine "Fuel Value" unit to EU/L Fixed mistake with Diesel Engine tooltip. Now asks for Gear boxes. Forgot to add recipe for Engine Intake. Redone the Gas/HPSteam turbine recipes. Fixed Oxygen/Lube being consumed if there is diesel in the hatch, but not enough for the engine to run Updated Engine GUI
2016-06-19Merge remote-tracking branch 'refs/remotes/Blood-Asp/experimental' into ↵Muramasa
DieselGenerator
2016-05-24Fixes #367 by adding missing buttons to guisMuramasa
2016-05-20Basically a rewriteMuramasa
2016-04-29Implemented Output CalculationMuramasa
2016-04-28More Cleanup and finalizingMuramasa
2016-04-19Main CommitMuramasa
2016-04-17Revert "Turbine Rebalance"Muramasa
This reverts commit ddc0c4299e8d3c703b6b93f876ce38f961d08236.
2016-04-17Turbine RebalanceMuramasa
Added 3 new turbine casings to rebalance the turbines. Also changed turbine controller recipes to fit the rebalance. Large Steam: Steel Turbine Casing Large HP Steam Turbine: Stainless Steel Turbine Casing Large Gas Turbine: Steel Turbine Casing Large Diesel Turbine: Titanium Turbine Casing Large Plasma Turbine: Tungstensteel Turbine Casing
2016-04-10Changed a few things to make the Soft Hammer more noticeable from the Hard ↵Draknyte1
Hammer. Now it's a soft Mallet with an inverted icon, as requested by @DarknessShadow - https://github.com/Blood-Asp/GT5-Unofficial/issues/407 # Conflicts: # src/main/java/gregtech/api/enums/OrePrefixes.java # src/main/java/gregtech/common/items/GT_MetaGenerated_Tool_01.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
2016-03-19Add Fluid Filter and Regulator coversBlood-Asp
2016-01-16Adding last missing modular armor texturesBlood-Asp
2016-01-03Explosives reworkBlood-Asp