Commit graph

208 commits

Author SHA1 Message Date
Muramasa
29ebfa577c Fixes #599 2016-08-22 16:47:43 +01:00
Muramasa
a987228a6a Small fixes 2016-08-22 11:39:04 +01:00
Muramasa
a0066b4a26 General cleanup & MaterialProcessing 2016-08-21 11:57:36 +01:00
Muramasa
46daf120bb initMaterialProperties 2016-08-19 12:15:05 +01:00
Muramasa
eaadf6f74b Config work 2016-08-18 07:00:57 +01:00
Muramasa
6917673264 Initial
Fixed Materials limitation
Added ability to add Materials via a config
Added ability to change all properties of a Material via a config
2016-08-17 06:09:55 +01:00
Muramasa
ccc7a18739 Bugfixes 10 2016-08-15 21:56:56 +01:00
Muramasa
0d9c100ade Const bool changes 2016-08-14 22:34:45 +01:00
Muramasa
7874d1c91f Bugfixes 8 2016-08-14 08:06:00 +01:00
Muramasa
e85097319b Bugfixes 7 2016-08-14 07:19:03 +01:00
Muramasa
b6032a3bd2 Bugfixes 4 2016-08-14 05:09:34 +01:00
Muramasa
27917b29b3 More String var changes 2016-08-13 15:01:09 +01:00
Muramasa
009709462e TryCatch changes 2016-08-13 10:10:11 +01:00
Muramasa
0345ada52c Remove null checks 2016-08-13 09:10:38 +01:00
Muramasa
9ca24419fb HashMap > ConcurrentHashMap & String vars 2016-08-13 08:28:24 +01:00
Muramasa
27f2ee906a Rest of d2a098f 2016-08-13 07:23:34 +01:00
Muramasa
7d3615d74a For loop changes 2016-08-13 07:18:11 +01:00
Muramasa
1647387280 GC Ore Support 2016-08-10 21:14:53 +01:00
Muramasa
25209a4bcb Merge GG into GT 2016-07-29 18:54:45 +01: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
Blood-Asp
bd51aba156 Merge pull request #576 from Muramasa-/UBCSupport
UBC Support / Ore System Restructure
2016-07-26 00:56:21 +02:00
OneEyeMaker
13caf1d699 Changed method of "repairing" of overheated coils.
Also moved initialization of SubTags to prevent NoClassDefFoundException.
2016-07-25 11:33:07 +03:00
OneEyeMaker
b6e4f869b8 Redesigned achievements. 2016-07-24 15:47:50 +03:00
DEMOOH
a5ba9e57fa Update GT_FuelLoader.java
Changed MK3 Naquadah Reactor to return naquadah cell instead of empty cell.
2016-07-24 15:32:26 +03:00
OneEyeMaker
4aaafe53f5 Changed Blast Furnace temperatures of some materials.
Now EV materials require HV+ heating coils, IV materials requires EV+ coils.
2016-07-24 10:27:03 +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
b3279513a3 Any component should require cables of its tier. 2016-07-21 16:59:56 +03:00
OneEyeMaker
2f454b9d82 Cables from IV materials and used as IV components should be IV. 2016-07-21 13:22:28 +03:00
DEMOOH
aa2196978b Update GT_MachineRecipeLoader.java
Added pitchblende multiplication recipe with Reactoria leaves.
2016-07-21 11:28:19 +03:00
Muramasa
248ce596a5 Ore System Rewrite part 2
Lots of ore system changes
Added Marble/Basalt gen
Ore Mixes can now have a specified biome name that they can only spawn
in
2016-07-21 07:24:42 +01:00
OneEyeMaker
47ce855868 Redefined some wires. Added last heating coil block. 2016-07-21 08:48:22 +03:00
OneEyeMaker
b7943a30c3 Fixed Blast Furnace recipe for Naquadah Alloy. 2016-07-20 10:45:46 +03:00
OneEyeMaker
f98e51a82f Added new tier of heating coils.
//TODO: Find material for LuV coils.
2016-07-20 10:27:47 +03:00
Muramasa
de6e90a000 Ore system rewrite 2016-07-18 19:00:53 +01:00
OneEyeMaker
ea5305f7df Restored broken compatibility. 2016-07-18 14:56:21 +03:00
OneEyeMaker
ce1e6917e0 Preparations for moving all heating coils to another block. 2016-07-18 09:06:26 +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
d21357bd84 Name fixes 2016-07-03 12:37:21 +02:00
Blood-Asp
c57aeee3ce rebalancing sifting output 2016-07-02 23:28:43 +02:00
Blood-Asp
ca0b8f396e make GT trigger ic2 achievements 2016-07-02 22:35:29 +02:00
Blood-Asp
c120f69351 Finished adding all component assemblyline recipes 2016-07-02 19:05:17 +02:00
Blood-Asp
c320af9f3e Even more changes 2016-07-01 22:23:04 +02:00
Blood-Asp
c2be6ff64c Small fixes and rebalances 2016-07-01 21:44:44 +02:00
Blood-Asp
20de7ff06f PR fixes: Turbine casings readded, Dieselgen readded, balancing changes
Also deactivated higher tier pumps, these cover so huge areas, that
servers lag extremely.
Nerfed new cables a bit.
2016-07-01 18:08:01 +02:00
Muramasa
63f64cb514 Initial 2016-07-01 13:15:55 +01:00
Blood-Asp
bcbeebf3b8 First Assemblyline recipes 2016-07-01 02:06:51 +02:00
Blood-Asp
90d776893e More Assembly Line recipe work 2016-06-30 00:12:00 +02:00
Blood-Asp
b9ee95c797 AL Recipe work 2016-06-27 23:49:18 +02:00
Blood-Asp
01b15f4251 Make Railcraft item Retrival name independent 2016-06-25 00:24:25 +02:00
Blood-Asp
e21311b919 Fix Superfuel railcraft compat and expand thaumcraft check 2016-06-24 17:49:22 +02:00
Blood-Asp
cea067c613 More superfuel fixes 2016-06-24 01:08:26 +02:00
Blood-Asp
25a0b460d4 Fix fluiddeath 2016-06-24 00:57:45 +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
210fc268b1 Remove old crop processing code 2016-06-23 19:31:02 +02:00
Blood-Asp
1d9eb4093e Readjusted Notch Apple fuel value 2016-06-23 18:45:59 +02:00
Blood-Asp
11721a7765 Changed Field Generator recipes 2016-06-23 01:02:58 +02:00
Muramasa
434450107b This client likes to uncheck files 2016-06-21 18:28:29 +01:00
Muramasa
6e656668cc Wrong pipe oredict 2016-06-21 00:35:10 +01: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
Blood-Asp
6af9d982c8 Notch apple to magic fuel 2016-06-20 00:24:09 +02:00
Blood-Asp
dcfa9c5df9 nerfed biogas from distillery 2016-06-20 00:11:29 +02:00
Blood-Asp
8269cd58e6 Fix wrong energy values for comp and crop processing 2016-06-20 00:07:55 +02:00
Blood-Asp
9887777ddd Cheaper chemical string production 2016-06-20 00:05:22 +02:00
Blood-Asp
87ef0280f0 Remove unused recipe code 2016-06-19 19:34:26 +02:00
Blood-Asp
3a249d8075 Merge pull request #500 from Muramasa-/DieselGenerator
Large Diesel Generator
2016-06-19 17:12:23 +02:00
Muramasa
58ed5088e1 Final commit 2016-06-12 19:32:29 +01:00
Muramasa
237e5e682d Possibly final commit 2016-06-01 06:34:33 +01:00
Blood-Asp
dc2a48259a Merge pull request #518 from Muramasa-/TweaksAndFixes
Crash  Fix / Various Tweaks
2016-05-27 20:11:07 +02:00
Blood-Asp
35a7a99808 Merge pull request #515 from OneEyeMaker/OreProcessing
Added configuration file, that enables processing of ores
2016-05-27 20:07:37 +02:00
Muramasa
ab6c431b88 Rearranged two achievements. Fixes #478 2016-05-25 22:25:24 +01:00
Muramasa
bbcc38e930 More fixes for #507 2016-05-25 19:16:41 +01:00
Muramasa
960087a0a8 Cleanup + Improvement 2016-05-23 18:15:21 +01:00
Muramasa
8880eb8d6d Basically a rewrite 2016-05-20 05:36:32 +01:00
OneEyeMaker
5169c509d6 Added configuration file to enabling processing of ores 2016-05-18 07:41:36 +03:00
MauveCloud
b2e564412f Added missing assembler recipes for casings
Added missing assembler recipes for casings: Basic Machine Casing, UV
Machine Casing, Heat Proof Machine Casing, Cupronickel Coil Block,
Kanthal Coil Block, Nichrome Coil Block, Superconducting Coil Block,
Solid Steel Machine Casing, Frost Proof Machine Casing, Robust
Tungstensteel Casing, Clean Stainless Steel Casing, Stable Titanium
Casing, Fusion Casing, Turbine Casing, Stainless Steel Turbine Casing,
Titanium Turbine Casing, Tungstensteel Turbine Casing
2016-05-12 14:24:04 -07: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
97eb99bd5d Main Commit for Large Diesel Generator 2016-04-28 00:58:55 +01:00
Muramasa
12a1d1c46e Main Commit 2016-04-19 23:17:31 +01:00
Muramasa
31e4330b69 Large Diesel Generator
Added large diesel generator to the game. It replicates the Large Plasma
Generator but it's nominal output is 1/8 that plasmas is.

Plasma Nominal: Optimal Steam Flow * 40
Diesel Nominal: Optimal Steam Flow * 5
2016-04-17 01:41:06 +01:00
Blood-Asp
c98736b7b3 Adding assembly line recipe check 2016-04-11 23:14:57 +02:00
Blood-Asp
22dd09be01 Adding assembly line recipes 2016-04-11 22:30:53 +02:00
Blood-Asp
3aae928510 Added Assembly Line Multiblock 2016-04-11 21:47:53 +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
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
44f3e89bdf Rebalance oil processing and improve pipe covering 2016-03-27 16:43:03 +02: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
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
bf5f8258cb Made HV Magic Energy Converter pre Fusion tech(Osmium) 2016-03-18 23:50:58 +01:00
Blood-Asp
c1f5c8c354 Added machine recipe for rotors, added silicone soft hammer 2016-03-18 23:05:38 +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
985130d6f4 Add Uranite crop drop 2016-03-17 23:50:12 +01:00
Blood-Asp
68601d5df9 Fix crop drop autoclave recipes 2016-03-16 23:57:27 +01:00