Commit graph

65 commits

Author SHA1 Message Date
Dragon2488
d1aad51c17 Some material changes 2017-07-07 07:16:21 +07:00
Dragon2488
f9a4e53adf Merge remote-tracking branch 'hub/1.10.2' 2017-07-01 02:08:27 +07:00
Dragon2488
5dbe9b0681 Material MetaItem, textures cleanup & additions. 2017-07-01 02:08:10 +07:00
Archengius
428319ca44 Merge pull request #1103 from Exidex/rewrite
[5.10] Add rendering of BlockCasings4 based on IBakedModel
2017-06-21 21:43:52 +07:00
Exidex
406d20aaf1 Add rendering of BlockCasings4 based on IBakedModel 2017-06-21 16:08:02 +02:00
Dragon2488
177a3f857c New implementation of Meta Tools, much cleaner and without overhead, because it extends MetaItem directly. Also cleaned some code and reorganized some item textures. 2017-06-16 02:58:15 +07:00
Exidex
5f462e7989 Json rendering 2017-06-15 15:19:24 +02:00
Dragon2488
ef6f2e275b Proper MetaItem implementation, removing of old meta items. 2017-06-11 18:00:19 +07:00
Dragon2488
2a79cfda63 some documentation 2017-04-26 19:35:05 +07:00
MauveCloud
b5f80e6820 Updated and corrected mcmod.info file
Mod description now shows up in Forge mods menu, and shows as "5.10"
instead of "5.09" in launchers that show mod versions.
2017-03-15 08:59:17 -07:00
Dragon2488
c5cab28bfa Crops, bugfixes. 2017-02-11 19:29:30 +07:00
Muramasa-
6c2c50a254 Update with 1.10 changes 2016-12-28 21:24:00 +00:00
Muramasa-
7957b2f4f3 Third pass 2016-12-27 23:48:43 +00:00
Dragon2488
af2bd443a0 Big bunch of bugfixes. 2016-12-24 04:34:35 +07:00
Muramasa-
2c8a4e7a81 First pass 2016-12-23 19:41:22 +00:00
Blood-Asp
f12ae9a63f Add Naquadah fuel rods and fix some Assemblyline recipes
Naquadah fuel = Mox with 10x runtime.
2016-10-22 16:38:18 +02:00
Blood-Asp
b48613dc7d Add EnderIO Rocket Fuel compat 2016-10-19 00:37:48 +02:00
Blood-Asp
7cec5fae5f Add the missing food crops 2016-10-17 17:13:41 +02:00
Blood-Asp
1e7a044fe0 Remove .bats since Curse does not like them. Take from old builds if needed. 2016-09-28 13:23:42 +02:00
Blood-Asp
a35cb1084f Merge pull request #569 from OneEyeMaker/NewFeatures
New Heating coils.
2016-07-27 01:52:15 +02:00
Draknyte1
dafe88d8e8 Makes GT Sound volume adjustable via proper sliders. 2016-07-27 07:46:59 +10: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
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
OneEyeMaker
47ce855868 Redefined some wires. Added last heating coil block. 2016-07-21 08:48:22 +03:00
OneEyeMaker
f98e51a82f Added new tier of heating coils.
//TODO: Find material for LuV coils.
2016-07-20 10:27:47 +03:00
OneEyeMaker
ea5305f7df Restored broken compatibility. 2016-07-18 14:56:21 +03:00
OneEyeMaker
b780ef6c2c Updated tooltips 2016-07-17 16:16:43 +03:00
OneEyeMaker
c9bc17bce5 Added new heating coil blocks. 2016-07-17 15:20:29 +03:00
Muramasa
51e269e3f5 Initial
This is more of a test and resource for when I eventually rewrite the
GT5U ore texture/metadata system.
2016-07-16 23:48:25 +01:00
Blood-Asp
c2be6ff64c Small fixes and rebalances 2016-07-01 21:44:44 +02:00
Blood-Asp
bcbeebf3b8 First Assemblyline recipes 2016-07-01 02:06:51 +02:00
Blood-Asp
b465f8f25c Adding LuV, ZPM and UV components 2016-07-01 01:41:28 +02:00
Blood-Asp
72ff25f9b7 Add new Fuel, Fix emitter and field gen recipes, add charcoal/lignite block fuel values 2016-06-23 23:43:22 +02:00
Blood-Asp
11721a7765 Changed Field Generator recipes 2016-06-23 01:02:58 +02:00
Muramasa
7e52fb2805 Bug fixes for my commits
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-21 00:17:21 +01:00
Muramasa
8e25705a3d Merge remote-tracking branch 'refs/remotes/Blood-Asp/experimental' into DieselGenerator 2016-06-19 23:46:40 +01:00
Muramasa
240d346883 Fixes #367 by adding missing buttons to guis 2016-05-24 21:59:42 +01:00
Muramasa
8880eb8d6d Basically a rewrite 2016-05-20 05:36:32 +01:00
Muramasa
4a59d0efbd Implemented Output Calculation 2016-04-29 07:31:58 +01:00
Muramasa
76902f45f7 More Cleanup and finalizing 2016-04-28 01:52:46 +01:00
Muramasa
12a1d1c46e Main Commit 2016-04-19 23:17:31 +01:00
Muramasa
79444adc76 Revert "Turbine Rebalance"
This reverts commit ddc0c4299e.
2016-04-17 07:41:35 +01:00
Muramasa
ddc0c4299e Turbine Rebalance
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-17 07:40:10 +01:00
Draknyte1
26e60b7020 Changed a few things to make the Soft Hammer more noticeable from the Hard 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-04-10 18:36:52 +10:00
Blood-Asp
f4b8aa6f3a Add Fluid Filter and Regulator covers 2016-03-19 20:51:20 +01:00
Blood-Asp
f385b880bd Adding last missing modular armor textures 2016-01-16 17:43:44 +01:00
Blood-Asp
cf69a7f392 Explosives rework 2016-01-03 02:16:02 +01:00