Commit graph

122 commits

Author SHA1 Message Date
Technus
8e17ef9334 Move texture to core 2017-01-12 22:52:02 +01:00
Technus
81ba247d78 Rework muffler add texture for eM overflow 2016-12-15 14:15:06 +01:00
Technus
6d291877d2 EM container. 2016-12-11 20:25:14 +01:00
Technus
392c3a3a7e ducttape fix glue 2016-11-30 11:42:23 +01:00
Technus
dc765d0ff8 Add 1G heat Cap and vent/exchanger vac freezer recipes. 2016-11-29 16:41:03 +01:00
Technus
92c4ee48c3 Naqudria MOX 2016-11-29 15:38:45 +01:00
Technus
7f8664b080 Cos it is the proper color... 2016-11-24 21:38:59 +01:00
Technus
6f03cd84cd some initial gui work 2016-11-22 16:40:21 +01:00
Technus
b638bc34c3 initial 2016-11-22 12:51:04 +01:00
Technus
26d4e8980e Fix texturing and feature finally done :D 2016-11-12 22:14:18 +01:00
Dream-Master
ab713c3265 more Ores Archivements 7 2016-11-05 16:14:37 +01:00
Dream-Master
870e4f07e7 more Ores Archivements 6 2016-11-05 15:45:35 +01:00
Dream-Master
d57d4fb3d9 more Ores Archivements 5 2016-11-05 15:41:22 +01:00
Dream-Master
04357cfa0f more Ores Archivements 4 2016-11-05 15:23:58 +01:00
Dream-Master
039e67e49f more Ores Archivements 3 2016-11-05 15:13:07 +01:00
Dream-Master
4fddc02db0 more Ores Archivements 2 2016-11-05 14:44:46 +01:00
Dream-Master
a0b7ceaa42 more Ores Archivements 2016-11-05 14:38:58 +01:00
Dream-Master
22d2fb1bcd Fixed Archivements. Add some new Test Archivemnts 2016-11-05 13:24:35 +01:00
Technus
c7b9f23f55 A better gui for oir rig 2016-11-01 21:47:12 +01:00
Technus
13c99700cf Teleporter and missing texture 2016-10-29 12:27:36 +02:00
Technus
26613df780 Textures 2016-10-28 00:11:26 +02:00
Technus
d85a01caad Revert "Hopefully fixes Auto maintenance on servers (still works on ssp)"
This reverts commit df0264a9ab.
2016-10-27 23:55:28 +02:00
Technus
df0264a9ab Hopefully fixes Auto maintenance on servers (still works on ssp) 2016-10-27 19:19:48 +02:00
Technus
5e80773208 slow down animations 2016-10-24 20:11:04 +02:00
Technus
5391eab047 Better Telly textures 2016-10-24 19:59:50 +02:00
Blood-Asp
eea7afb539 Auto maintenance (LuV) and optimization + my texture for it 2016-10-24 11:17:46 +02:00
Blood-Asp
c16c49127d Nq reactor cells, and fix some ass line BloodASP 2016-10-23 10:54:34 +02:00
Technus
5849d99645 Texture changes 2016-10-19 16:05:06 +02:00
Dream-Master
bf25038fc1 remove png 2016-10-16 00:27:52 +02:00
Dream-Master
2e8778e1c9 remove because to make sense 2016-10-16 00:27:20 +02:00
Dream-Master
abea0b3e1c add and try this 2016-10-16 00:09:35 +02:00
Dream-Master
8c24ed1a72 add png 2016-10-15 23:52:13 +02:00
Technus
b9603b50ca Added textures. 2016-10-05 15:12:32 +02:00
Technus
5680bf3cbd More Texture Work 2016-09-21 22:14:51 +02:00
Technus
8059f589c2 textures work 2016-09-21 22:14:43 +02:00
Technus
1fbd1ac81a Ading textures - if possible cherry pick into main 2016-09-07 19:25:05 +02:00
Draknyte1
55bf454318 Makes GT Sound volume adjustable via proper sliders. 2016-07-27 17:06:18 +02:00
Dream-Master
2efe1b9f51 Merge remote-tracking branch 'upstream/NewFeatures' into new-features
Conflicts:
	.gitignore
	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/OrePrefixes.java
	src/main/java/gregtech/api/interfaces/internal/IGT_RecipeAdder.java
	src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicMachine_GT_Recipe.java
	src/main/java/gregtech/api/util/GT_BaseCrop.java
	src/main/java/gregtech/api/util/GT_Recipe.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_Worldgen_GT_Ore_SmallPieces.java
	src/main/java/gregtech/common/GT_Worldgen_Stone.java
	src/main/java/gregtech/common/GT_Worldgenerator.java
	src/main/java/gregtech/common/blocks/GT_Block_Casings1.java
	src/main/java/gregtech/common/blocks/GT_Block_Casings2.java
	src/main/java/gregtech/common/blocks/GT_Block_Concretes.java
	src/main/java/gregtech/common/blocks/GT_Block_Machines.java
	src/main/java/gregtech/common/blocks/GT_Block_Ores.java
	src/main/java/gregtech/common/blocks/GT_Block_Reinforced.java
	src/main/java/gregtech/common/blocks/GT_Item_Casings1.java
	src/main/java/gregtech/common/blocks/GT_Item_Casings_Abstract.java
	src/main/java/gregtech/common/blocks/GT_TileEntity_Ores.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_Fluidfilter.java
	src/main/java/gregtech/common/covers/GT_Cover_ItemMeter.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_RedstoneTransmitterInternal.java
	src/main/java/gregtech/common/covers/GT_Cover_Shutter.java
	src/main/java/gregtech/common/gui/GT_Container_Filter.java
	src/main/java/gregtech/common/items/GT_FluidDisplayItem.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_Tool_01.java
	src/main/java/gregtech/common/items/GT_SensorCard_Item.java
	src/main/java/gregtech/common/items/ItemComb.java
	src/main/java/gregtech/common/items/behaviors/Behaviour_Plunger_Fluid.java
	src/main/java/gregtech/common/items/behaviors/Behaviour_Prospecting.java
	src/main/java/gregtech/common/items/behaviors/Behaviour_Spray_Color.java
	src/main/java/gregtech/common/tileentities/automation/GT_MetaTileEntity_TypeFilter.java
	src/main/java/gregtech/common/tileentities/boilers/GT_MetaTileEntity_Boiler_Lava.java
	src/main/java/gregtech/common/tileentities/boilers/GT_MetaTileEntity_Boiler_Solar.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_GasTurbine.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_Disassembler.java
	src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Massfabricator.java
	src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Scanner.java
	src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_SeismicProspector.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_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_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_LargeTurbine.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_PyrolyseOven.java
	src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_VacuumFreezer.java
	src/main/java/gregtech/common/tools/GT_Tool.java
	src/main/java/gregtech/common/tools/GT_Tool_Chainsaw_LV.java
	src/main/java/gregtech/common/tools/GT_Tool_Drill_HV.java
	src/main/java/gregtech/common/tools/GT_Tool_Drill_LV.java
	src/main/java/gregtech/common/tools/GT_Tool_Sense.java
	src/main/java/gregtech/common/tools/GT_Tool_Wrench.java
	src/main/java/gregtech/loaders/load/GT_FuelLoader.java
	src/main/java/gregtech/loaders/misc/GT_BeeDefinition.java
	src/main/java/gregtech/loaders/oreprocessing/ProcessingCrushedPurified.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/postload/GT_CraftingRecipeLoader.java
	src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java
	src/main/java/gregtech/loaders/postload/GT_RecyclerBlacklistLoader.java
	src/main/java/gregtech/loaders/postload/GT_Worldgenloader.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_OreDictionary.java
	src/main/resources/assets/gregtech/lang/en_US.lang
	src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.argon.png.mcmeta
2016-07-26 18:25:35 +02:00
OneEyeMaker
cda6044614 c4bd35d7cd 2016-07-26 17:07:31 +02:00
OneEyeMaker
9946e904b4 Merge branch 'experimental' into NewFeatures 2016-07-26 09:01:16 +03:00
OneEyeMaker
c4bd35d7cd Coils should be deprecated 2016-07-26 07:31:57 +03:00
Muramasa
16cac26b72 Separated multiblock overlay and gui textures 2016-07-26 00:52:30 +01:00
OneEyeMaker
c485ef4720 b6e4f869b8 2016-07-25 23:13:40 +02:00
OneEyeMaker
1f1664152c 47ce855868 2016-07-25 22:55:51 +02:00
OneEyeMaker
d0396c268c f98e51a82f 2016-07-25 22:53:13 +02:00
OneEyeMaker
718d28bd23 ea5305f7df 2016-07-25 22:36:29 +02:00
OneEyeMaker
218d45c99d b780ef6c2c 2016-07-25 22:23:13 +02:00
OneEyeMaker
49c063f24a c9bc17bce5 2016-07-25 22:18:51 +02:00
OneEyeMaker
b6e4f869b8 Redesigned achievements. 2016-07-24 15:47:50 +03:00
Muramasa
676e326ec0 Various fixes/cleanup
Game will no longer crash without UBC loaded
Added missing mallet textures to materialicon Lignite
2016-07-22 01:41:51 +01:00