Commit graph

982 commits

Author SHA1 Message Date
Blood-Asp
150aed2f84 Merge pull request #482 from draknyte1/UpToDateGTPRBranch
Changes Soft Hammer -> Soft Mallet & Flips Icon. Makes them easier to differ now.
2016-04-11 13:41:51 +02:00
Alkalus
e634563157 Update ProcessingPipeMedium.java
Apparently it has a newline at the end.
2016-04-11 20:54:52 +10:00
Alkalus
f1af2039bb Update ProcessingPipeSmall.java
Apparently it has a newline at the end.
2016-04-11 20:54:45 +10:00
Alkalus
63d70c3ff0 Update ProcessingPipeLarge.java
Apparently it has a newline at the end.
2016-04-11 20:54:27 +10:00
Draknyte1
36a97e706b Submitting PR's is a pain.
Always use most up to date files for the repo you're contributing to. #NotGT5.8Files
2016-04-11 20:47:30 +10:00
Draknyte1
0f8d8b95d1 Merge branch 'UpToDateGTPRBranch' of https://github.com/draknyte1/GT5-Unofficial into UpToDateGTPRBranch 2016-04-11 20:36:08 +10:00
Draknyte1
523d2c449e Should fix any issues. 2016-04-11 20:34:56 +10:00
Alkalus
ba1f0f99ab Update GT_MetaGenerated_Tool_01.java
left a : not a ;
2016-04-10 19:29:56 +10:00
Draknyte1
1d279c741f Made these up to date with latest experimental commit, as mine were slightly out of date. :) 2016-04-10 19:15:41 +10: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
a04b7f5159 Merge pull request #473 from leagris/experimental
Fix #472 #219
2016-04-04 21:53:58 +02:00
Léa Gris
aa922c5470 Re Fix #472 #219 2016-04-04 18:43:35 +02:00
Léa Gris
8a2406de8a Fix #472 #219 2016-04-04 18:20:54 +02:00
Blood-Asp
9e5819e931 made EV charger recipe oredict 2016-04-02 16:18:08 +02:00
John
0aad2f7689 Merge pull request #1 from Blood-Asp/experimental
Update from orig
2016-04-02 16:07:59 +05:00
Blood-Asp
b71fa8f042 advminer2 2016-03-28 03:36:09 +02:00
Blood-Asp
b8579b2ee3 small fixes to distillation tower and advMiner2 2016-03-28 03:35:21 +02:00
Blood-Asp
ff4cfa3933 Update buildscript to add NC2 2016-03-27 19:41:23 +02:00
Blood-Asp
af20a2e4ab Show all ingot fluid extractions and all iron/copper arc furnace recipes 2016-03-27 17:50:10 +02:00
Blood-Asp
80d362ceb8 Stop disassembler destroying not electric GT tools 2016-03-27 16:54:11 +02:00
Blood-Asp
44f3e89bdf Rebalance oil processing and improve pipe covering 2016-03-27 16:43:03 +02:00
Blood-Asp
e56a98af45 Update Charcoal pit tooltip 2016-03-27 15:26:36 +02:00
Blood-Asp
6e0f90964e Fix regulator crafting recipes 2016-03-20 23:34:09 +01:00
Blood-Asp
b2ac24e85a Tooltip fix 2016-03-20 17:08:33 +01:00
Blood-Asp
41af922dd2 Gunpowder no longer unlocks clean dust achievement 2016-03-20 16:51:01 +01:00
Blood-Asp
009c032c13 Hiding of Recycling recipes and unneeded ores in NEI 2016-03-20 16:47:17 +01:00
Blood-Asp
ac258896de remove console print 2016-03-20 14:59:07 +01:00
Blood-Asp
529c28649a Fix item detector not working correctly 2016-03-20 14:57:51 +01:00
Blood-Asp
29b387fbce fix forestry plants above meta 15 2016-03-20 14:40:45 +01:00
Blood-Asp
c7c8ba7020 More work on tool hardening 2016-03-20 01:23:03 +01:00
Blood-Asp
20cd83a175 Allow shift rightclick for screwdrivers 2016-03-19 22:15:50 +01:00
Blood-Asp
f4b8aa6f3a Add Fluid Filter and Regulator covers 2016-03-19 20:51:20 +01:00
Blood-Asp
bf5f8258cb Made HV Magic Energy Converter pre Fusion tech(Osmium) 2016-03-18 23:50:58 +01:00
Blood-Asp
b4eb7f494f Advanced Miner II fixes 2016-03-18 23:29:24 +01:00
Blood-Asp
c1f5c8c354 Added machine recipe for rotors, added silicone soft hammer 2016-03-18 23:05:38 +01:00
Blood-Asp
e8f0482b16 Dynamite impcomp and fluid mox fixes 2016-03-18 22:43:22 +01:00
Blood-Asp
e51cd6433d wildcard lathe recipes 2016-03-18 22:37:26 +01:00
Blood-Asp
32d4542fbc Added bowl lathe recipes 2016-03-18 22:29:57 +01:00
Blood-Asp
df28bd66ec HP Turbine deletes normal steam in input hatch to not get stuck 2016-03-18 22:22:27 +01:00
Blood-Asp
985130d6f4 Add Uranite crop drop 2016-03-17 23:50:12 +01:00
Blood-Asp
a8f91902d1 Improved Sense 2016-03-17 23:35:10 +01:00
Blood-Asp
cd61ff3ae1 Made Large fluid cells stack more and cheaper to build 2016-03-17 00:53:28 +01:00
Blood-Asp
a80e44f7f5 Added sharpness enchantment for HSS material tools 2016-03-17 00:49:47 +01:00
Blood-Asp
be8d29da74 Fixed turbine output falling when supplying more than opt flow 2016-03-17 00:41:15 +01:00
Blood-Asp
7ac0849c1a Added NC display support for large turbines 2016-03-17 00:28:09 +01:00
Blood-Asp
68601d5df9 Fix crop drop autoclave recipes 2016-03-16 23:57:27 +01:00
Blood-Asp
3e39b7c233 Fix large boiler tooltip 2016-03-16 23:54:23 +01:00
Blood-Asp
0a6e69e254 Rised crop root length to match IC2 again 2016-03-16 23:52:52 +01:00
Blood-Asp
2544d46c91 Fix Forestry woods above meta 15 not effected by wood nerv 2016-03-16 23:49:35 +01:00
Blood-Asp
9e7f34a12f Fix heavy oil gen without messing everything up 2016-03-16 22:49:15 +01:00