aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Robertz <dream-master@gmx.net>2021-05-24 16:45:15 +0200
committerGitHub <noreply@github.com>2021-05-24 16:45:15 +0200
commit12582fb1cec74a5d05a1adfedc1eb04e4f7409c1 (patch)
tree18ebd936b02506772cd2004d0c893d8dcecb1cad
parentc39086946112174b81612e7fd96a2ce0ad056620 (diff)
parenta4e104881944bbc03eddeacb24a6b7bd94cc53ce (diff)
downloadGT5-Unofficial-12582fb1cec74a5d05a1adfedc1eb04e4f7409c1.tar.gz
GT5-Unofficial-12582fb1cec74a5d05a1adfedc1eb04e4f7409c1.tar.bz2
GT5-Unofficial-12582fb1cec74a5d05a1adfedc1eb04e4f7409c1.zip
Merge pull request #546 from GTNewHorizons/glow-texture
fix(render): grass block top grey in inventory
-rw-r--r--src/main/java/gregtech/api/enums/TextureSet.java4
-rw-r--r--src/main/java/gregtech/api/enums/Textures.java148
-rw-r--r--src/main/java/gregtech/api/gui/GT_GUICover.java8
-rw-r--r--src/main/java/gregtech/api/gui/widgets/GT_GuiIconButton.java2
-rw-r--r--src/main/java/gregtech/api/gui/widgets/GT_GuiIconCheckButton.java1
-rw-r--r--src/main/java/gregtech/api/items/GT_Block_LongDistancePipe.java15
-rw-r--r--src/main/java/gregtech/api/items/GT_CoolantCellIC_Item.java7
-rw-r--r--src/main/java/gregtech/api/items/GT_CoolantCell_Item.java1
-rw-r--r--src/main/java/gregtech/api/items/GT_RadioactiveCellIC_Item.java8
-rw-r--r--src/main/java/gregtech/api/items/GT_RadioactiveCell_Item.java2
-rw-r--r--src/main/java/gregtech/api/metatileentity/BaseMetaTileEntity.java1
-rw-r--r--src/main/java/gregtech/api/metatileentity/MetaPipeEntity.java4
-rw-r--r--src/main/java/gregtech/api/metatileentity/MetaTileEntity.java1
-rw-r--r--src/main/java/gregtech/api/metatileentity/examples/GT_MetaTileEntity_E_Furnace.java40
-rw-r--r--src/main/java/gregtech/api/metatileentity/implementations/GT_MetaPipeEntity_Cable.java1
-rw-r--r--src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_InputBus.java1
-rw-r--r--src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Output.java1
-rw-r--r--src/main/java/gregtech/api/objects/AE2DigitalChestHandler.java2
-rw-r--r--src/main/java/gregtech/api/objects/GT_ChunkManager.java18
-rw-r--r--src/main/java/gregtech/api/objects/GT_MultiTexture.java1
-rw-r--r--src/main/java/gregtech/api/objects/XSTR.java14
-rw-r--r--src/main/java/gregtech/api/util/GT_BaseCrop.java3
-rw-r--r--src/main/java/gregtech/api/util/GT_Recipe.java3
-rw-r--r--src/main/java/gregtech/api/util/GT_RecipeRegistrator.java2
-rw-r--r--src/main/java/gregtech/api/util/WorldSpawnedEventBuilder.java3
-rw-r--r--src/main/java/gregtech/common/GT_Client.java12
-rw-r--r--src/main/java/gregtech/common/GT_DummyWorld.java20
-rw-r--r--src/main/java/gregtech/common/GT_IteratorRandom.java1
-rw-r--r--src/main/java/gregtech/common/GT_MinableOreGenerator.java1
-rw-r--r--src/main/java/gregtech/common/GT_PlayerActivityLogger.java1
-rw-r--r--src/main/java/gregtech/common/GT_Proxy.java2
-rw-r--r--src/main/java/gregtech/common/GT_RecipeAdder.java99
-rw-r--r--src/main/java/gregtech/common/GT_Server.java6
-rw-r--r--src/main/java/gregtech/common/GT_ThaumcraftCompat.java10
-rw-r--r--src/main/java/gregtech/common/GT_Worldgen_GT_Ore_Layer.java1
-rw-r--r--src/main/java/gregtech/common/GT_Worldgen_GT_Ore_SmallPieces.java3
-rw-r--r--src/main/java/gregtech/common/GT_Worldgen_Stone.java1
-rw-r--r--src/main/java/gregtech/common/GT_Worldgenerator.java2
-rw-r--r--src/main/java/gregtech/common/bees/GT_AlleleHelper.java1
-rw-r--r--src/main/java/gregtech/common/blocks/GT_Block_Casings1.java2
-rw-r--r--src/main/java/gregtech/common/blocks/GT_Block_Casings2.java2
-rw-r--r--src/main/java/gregtech/common/blocks/GT_Block_Casings3.java1
-rw-r--r--src/main/java/gregtech/common/blocks/GT_Block_Casings4.java2
-rw-r--r--src/main/java/gregtech/common/blocks/GT_Block_Casings6.java1
-rw-r--r--src/main/java/gregtech/common/blocks/GT_Block_Casings_Abstract.java20
-rw-r--r--src/main/java/gregtech/common/blocks/GT_Block_Concretes.java3
-rw-r--r--src/main/java/gregtech/common/blocks/GT_Block_Granites.java4
-rw-r--r--src/main/java/gregtech/common/blocks/GT_Block_Metal.java1
-rw-r--r--src/main/java/gregtech/common/blocks/GT_Block_Ores_Abstract.java25
-rw-r--r--src/main/java/gregtech/common/blocks/GT_Block_Reinforced.java25
-rw-r--r--src/main/java/gregtech/common/blocks/GT_Block_Stones.java3
-rw-r--r--src/main/java/gregtech/common/blocks/GT_Block_Stones_Abstract.java4
-rw-r--r--src/main/java/gregtech/common/blocks/GT_Block_Storage.java17
-rw-r--r--src/main/java/gregtech/common/blocks/GT_Item_Casings2.java1
-rw-r--r--src/main/java/gregtech/common/blocks/GT_Item_Casings_Abstract.java3
-rw-r--r--src/main/java/gregtech/common/blocks/GT_Item_Concretes.java1
-rw-r--r--src/main/java/gregtech/common/blocks/GT_Item_LongDistancePipe.java3
-rw-r--r--src/main/java/gregtech/common/blocks/GT_Item_Machines.java6
-rw-r--r--src/main/java/gregtech/common/blocks/GT_Item_Ores.java4
-rw-r--r--src/main/java/gregtech/common/blocks/GT_Item_Stones_Abstract.java3
-rw-r--r--src/main/java/gregtech/common/blocks/GT_Item_Storage.java4
-rw-r--r--src/main/java/gregtech/common/blocks/GT_Material_Casings.java1
-rw-r--r--src/main/java/gregtech/common/blocks/GT_Material_Machines.java1
-rw-r--r--src/main/java/gregtech/common/blocks/GT_Material_Reinforced.java1
-rw-r--r--src/main/java/gregtech/common/blocks/GT_Packet_Ores.java3
-rw-r--r--src/main/java/gregtech/common/blocks/GT_TileEntity_Ores.java5
-rw-r--r--src/main/java/gregtech/common/covers/GT_Cover_Arm.java29
-rw-r--r--src/main/java/gregtech/common/covers/GT_Cover_ControlsWork.java19
-rw-r--r--src/main/java/gregtech/common/covers/GT_Cover_Conveyor.java21
-rw-r--r--src/main/java/gregtech/common/covers/GT_Cover_Crafting.java2
-rw-r--r--src/main/java/gregtech/common/covers/GT_Cover_DoesWork.java19
-rw-r--r--src/main/java/gregtech/common/covers/GT_Cover_Drain.java5
-rw-r--r--src/main/java/gregtech/common/covers/GT_Cover_EUMeter.java19
-rw-r--r--src/main/java/gregtech/common/covers/GT_Cover_EnergyOnly.java14
-rw-r--r--src/main/java/gregtech/common/covers/GT_Cover_FluidRegulator.java56
-rw-r--r--src/main/java/gregtech/common/covers/GT_Cover_Fluidfilter.java15
-rw-r--r--src/main/java/gregtech/common/covers/GT_Cover_ItemMeter.java18
-rw-r--r--src/main/java/gregtech/common/covers/GT_Cover_Lens.java1
-rw-r--r--src/main/java/gregtech/common/covers/GT_Cover_LiquidMeter.java19
-rw-r--r--src/main/java/gregtech/common/covers/GT_Cover_NeedMaintainance.java19
-rw-r--r--src/main/java/gregtech/common/covers/GT_Cover_PlayerDetector.java19
-rw-r--r--src/main/java/gregtech/common/covers/GT_Cover_Pump.java21
-rw-r--r--src/main/java/gregtech/common/covers/GT_Cover_RedstoneConductor.java10
-rw-r--r--src/main/java/gregtech/common/covers/GT_Cover_RedstoneReceiverExternal.java3
-rw-r--r--src/main/java/gregtech/common/covers/GT_Cover_RedstoneReceiverInternal.java3
-rw-r--r--src/main/java/gregtech/common/covers/GT_Cover_RedstoneSignalizer.java9
-rw-r--r--src/main/java/gregtech/common/covers/GT_Cover_RedstoneTransmitterExternal.java3
-rw-r--r--src/main/java/gregtech/common/covers/GT_Cover_RedstoneTransmitterInternal.java4
-rw-r--r--src/main/java/gregtech/common/covers/GT_Cover_RedstoneWirelessBase.java19
-rw-r--r--src/main/java/gregtech/common/covers/GT_Cover_Screen.java14
-rw-r--r--src/main/java/gregtech/common/covers/GT_Cover_Shutter.java21
-rw-r--r--src/main/java/gregtech/common/covers/GT_Cover_SolarPanel.java3
-rw-r--r--src/main/java/gregtech/common/covers/GT_Cover_Vent.java3
-rw-r--r--src/main/java/gregtech/common/entities/GT_Entity_Arrow.java5
-rw-r--r--src/main/java/gregtech/common/entities/GT_Entity_Arrow_Potion.java4
-rw-r--r--src/main/java/gregtech/common/gui/GT_Container_Boiler.java5
-rw-r--r--src/main/java/gregtech/common/gui/GT_Container_BronzeBlastFurnace.java3
-rw-r--r--src/main/java/gregtech/common/gui/GT_Container_ChestBuffer.java4
-rw-r--r--src/main/java/gregtech/common/gui/GT_Container_Filter.java4
-rw-r--r--src/main/java/gregtech/common/gui/GT_Container_ItemDistributor.java4
-rw-r--r--src/main/java/gregtech/common/gui/GT_Container_MicrowaveEnergyTransmitter.java1
-rw-r--r--src/main/java/gregtech/common/gui/GT_Container_PrimitiveBlastFurnace.java3
-rw-r--r--src/main/java/gregtech/common/gui/GT_Container_Regulator.java6
-rw-r--r--src/main/java/gregtech/common/gui/GT_Container_SuperBuffer.java4
-rw-r--r--src/main/java/gregtech/common/gui/GT_Container_Teleporter.java1
-rw-r--r--src/main/java/gregtech/common/gui/GT_Container_TypeFilter.java4
-rw-r--r--src/main/java/gregtech/common/gui/GT_GUIContainerVolumetricFlask.java6
-rw-r--r--src/main/java/gregtech/common/gui/GT_GUIContainer_Boiler.java2
-rw-r--r--src/main/java/gregtech/common/gui/GT_GUIContainer_BronzeBlastFurnace.java2
-rw-r--r--src/main/java/gregtech/common/gui/GT_GUIContainer_ChestBuffer.java1
-rw-r--r--src/main/java/gregtech/common/gui/GT_GUIContainer_Filter.java1
-rw-r--r--src/main/java/gregtech/common/gui/GT_GUIContainer_ItemDistributor.java1
-rw-r--r--src/main/java/gregtech/common/gui/GT_GUIContainer_MicrowaveEnergyTransmitter.java2
-rw-r--r--src/main/java/gregtech/common/gui/GT_GUIContainer_PrimitiveBlastFurnace.java2
-rw-r--r--src/main/java/gregtech/common/gui/GT_GUIContainer_Regulator.java2
-rw-r--r--src/main/java/gregtech/common/gui/GT_GUIContainer_SuperBuffer.java1
-rw-r--r--src/main/java/gregtech/common/gui/GT_GUIContainer_Teleporter.java2
-rw-r--r--src/main/java/gregtech/common/gui/GT_GUIContainer_TypeFilter.java1
-rw-r--r--