aboutsummaryrefslogtreecommitdiff
path: root/src/main/resources/assets/gregtech/textures/items
AgeCommit message (Collapse)Author
2017-06-25Merge branch 'BrickedBlastFurnace' into unstableJohannes Gäßler
Conflicts: src/main/java/gregtech/GT_Mod.java src/main/java/gregtech/api/enums/Materials.java src/main/java/gregtech/common/GT_Proxy.java src/main/java/gregtech/common/blocks/GT_Block_Casings4.java src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java
2017-06-18Merge remote-tracking branch 'origin/unstable' into OilRefiningJohannes Gäßler
Conflicts: src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java
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-13Reworking DataOrb and DataStickTechlone
2017-06-05Added Rape Crop as a new source of Seed OilJohannes Gäßler
2017-03-01More circuit balancingBlood-Asp
2017-02-28Circuit changesBlood-Asp
2016-10-22Add Naquadah fuel rods and fix some Assemblyline recipesBlood-Asp
Naquadah fuel = Mox with 10x runtime.
2016-09-28Remove .bats since Curse does not like them. Take from old builds if needed.Blood-Asp
2016-07-22Various fixes/cleanupMuramasa
Game will no longer crash without UBC loaded Added missing mallet textures to materialicon Lignite
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-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
2015-12-28fix armor textures and initBlood-Asp
2015-12-25Overriding IC2 fuel rodsBlood-Asp
2015-12-06Moved Sulfide ore processing from IHL to GTBlood-Asp
2015-11-18GT Bee fix + new crop textures.Blood-Asp
2015-11-01Added new crop drops and processing recipes.Blood-Asp
2015-10-24missing texturesBlood-Asp
The resources were missing all experimental textures.
2015-10-21Move source filesShawn Buckley