Commit graph

222 commits

Author SHA1 Message Date
Muramasa
fed8109b17 Update with exp changes 2016-09-24 23:05:18 +01:00
Blood-Asp
6217cca671 Return slabs on paper crafting and add metal subtags to TungstenCarbine, VanadiumSteel, ect 2016-09-23 19:42:42 +02:00
Muramasa
ec9bd39c02 Fix missing code block 2016-09-23 14:16:53 +01:00
Muramasa
291839871e Reduce disabled component creation & GT_Proxy postInit -> Processors 2016-09-23 02:28:29 +01:00
Muramasa
23546a5c2c Stop disabled component recipe gen, more separation and fixes 2016-09-16 15:01:37 +01:00
Muramasa
312141cd10 Fix it again 2016-09-16 12:17:19 +01:00
Muramasa
6ac01a92c9 Fix conflicts 2016-09-16 00:17:08 +01:00
Blood-Asp
0e60389c41 Fix Tools and lag on reading tooltip 2016-09-15 22:02:18 +02:00
Muramasa
b22bb2dfa6 Update Part 1 2016-09-15 15:48:47 +01:00
Blood-Asp
c997df5952 Add Magneticraft compat
and remove Thaumcraft changes because of bugs/no improvements
And add config to arc smelt not annealed/wought.
2016-09-15 16:36:08 +02:00
Muramasa-
059cf34455 Merge pull request #631 from Muramasa-/LoadTimes
Various Load Time Improvements
2016-09-13 21:09:38 +01:00
Blood-Asp
a7c0bd518b Gave away new bock ids. 2016-09-13 00:29:43 +02:00
Muramasa
33e6060119 Simplify, cleanup and seperate processors 2016-09-10 13:20:09 +01:00
Muramasa
f53fb2b84b Bugfixes and now using built in OrePrefixes enabled/disabled lists 2016-09-09 14:25:59 +01:00
Muramasa
ac013d92c7 Actually, probably better to just exclude these 2016-08-31 04:57:16 +01:00
Muramasa
adca5141f9 fix issue with chest loot on server start 2016-08-31 04:47:54 +01:00
Muramasa
e1d777397f Fix lens recipes & duplicate config list entries 2016-08-31 03:58:43 +01:00
Muramasa
415e683a43 Configurable components & fixes 2016-08-31 02:22:51 +01:00
Muramasa
c66db54eab Fixes & work on #266 2016-08-23 16:39:20 +01:00
Muramasa-
ccfc536501 Merge pull request #603 from Muramasa-/Mats
Material Rework
2016-08-22 22:50:58 +01:00
Muramasa
5a94ea039b Some cleanup 2016-08-22 22:31:19 +01:00
Blood-Asp
49e5b53706 #573 Turbines now explode when producing more EU than dynamo can handle 2016-08-22 23:01:29 +02:00
Muramasa
a987228a6a Small fixes 2016-08-22 11:39:04 +01:00
Muramasa
0c4ec9a724 More compatibility fixes 2016-08-21 13:26:38 +01:00
Muramasa
a0066b4a26 General cleanup & MaterialProcessing 2016-08-21 11:57:36 +01:00
Muramasa
96b402648b Constructor fix 2016-08-19 13:19:16 +01:00
Muramasa
2c2105284c Whoops 2016-08-19 12:17:08 +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
0307f682b5 Bugfixes 9 2016-08-14 08:36:42 +01:00
Muramasa
5e5fa8cf38 Revert switch change 2016-08-14 08:12:25 +01:00
Muramasa
7874d1c91f Bugfixes 8 2016-08-14 08:06:00 +01:00
Muramasa
5eb2857389 Bugfixes 3/2/1 fix: Remove commented code 2016-08-14 07:40:20 +01:00
Muramasa
30b7a0d7e8 Bugfixes 4 fix: Remove commented code 2016-08-14 07:34:36 +01:00
Muramasa
1abb196a2f Bugfixes 5 fix: Removed commented code 2016-08-14 07:32:19 +01:00
Muramasa
f94313e9b1 Bugfixes 6 fix: Removed commented code 2016-08-14 07:24:57 +01:00
Muramasa
e85097319b Bugfixes 7 2016-08-14 07:19:03 +01:00
Muramasa
19062e1d36 Bugfixes 6 2016-08-14 05:56:41 +01:00
Muramasa
bfccecf87b Bugfixes 5 2016-08-14 05:36:12 +01:00
Muramasa
b6032a3bd2 Bugfixes 4 2016-08-14 05:09:34 +01:00
Muramasa
2bd06dc60e Bugfixes 3 2016-08-14 04:58:51 +01:00
Muramasa
8cdba03c0a Bugfixes 2 2016-08-14 03:50:59 +01:00
Muramasa
27917b29b3 More String var changes 2016-08-13 15:01:09 +01:00
Muramasa
c7ddde35e8 Small fix 2016-08-13 10:12:40 +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
d2a098f80e PostInit reduction & Save registered recipes (No speed loss) 2016-08-13 07:18:32 +01:00
Muramasa
7d3615d74a For loop changes 2016-08-13 07:18:11 +01:00
Muramasa
ce1195d48c Worldgen and Random changes 2016-08-13 07:15:58 +01:00
Muramasa
349510f2da Bugfixes 1 2016-08-13 07:09:55 +01:00
Muramasa
1647387280 GC Ore Support 2016-08-10 21:14:53 +01:00
Daniel
450bb19519 Paintable Wires 2016-08-07 08:39:14 +02:00
Blood-Asp
b4bcebf458 Handle fuel value as integer 2016-07-27 01:58:32 +02:00
OneEyeMaker
9c788fa292 Restored TextureSets 2016-07-26 20:02:41 +03:00
OneEyeMaker
eec5b2faa7 Fixed merge conflicts. 2016-07-26 09:02:10 +03: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
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
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
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
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
bd689c6253 Merge pull request #1 from OneEyeMaker/NewFeaturesIncompatible
Heating coils moved to separated block.
2016-07-18 15:44:35 +03:00
OneEyeMaker
ea5305f7df Restored broken compatibility. 2016-07-18 14:56:21 +03:00
OneEyeMaker
2b9d87f293 Naquadah should be more expensive. 2016-07-18 10:16:55 +03:00
OneEyeMaker
8bf5b61dea Moved all coils to another block. 2016-07-18 10:05:44 +03:00
OneEyeMaker
ce1e6917e0 Preparations for moving all heating coils to another block. 2016-07-18 09:06:26 +03:00
OneEyeMaker
effe6699f5 Now Naquadria (source of Neutronium) requires highest tier of heating coils. 2016-07-17 17:29:18 +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
704d534b43 More Pollution work 2016-07-03 18:35:51 +02:00
Blood-Asp
57deb3b3e1 Pollution basework 2016-07-03 18:31:06 +02:00
Blood-Asp
f027492fb2 Rised generator internal EU storage to counter production bug 2016-07-03 11:55:45 +02:00
Blood-Asp
d328f7bc88 Fix IC2 glass crash 2016-07-02 12:40:30 +02:00
Blood-Asp
c320af9f3e Even more changes 2016-07-01 22:23:04 +02:00
Muramasa
1b162ae25e Changed wire/rotor components 2016-07-01 15:41:08 +01:00
Muramasa
63f64cb514 Initial 2016-07-01 13:15:55 +01: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
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
Blood-Asp
7a9c3857e2 Merge pull request #526 from perkinslr/experimental
Make processing array handle multiple input stacks at a time
2016-06-21 19:56:34 +02:00
Blood-Asp
d61667d436 Improved Ultimet stats 2016-06-20 00:39:42 +02:00
Blood-Asp
91fc3a20cd Implement IBoxable for radioactive componentes 2016-06-19 20:49:52 +02:00
Blood-Asp
e340d17337 Improved Neutronium for being highest tier material 2016-06-19 19:55:22 +02:00
Blood-Asp
537d6e9330 changed plasma turbine damage and added config 2016-06-19 19:43:14 +02:00
Blood-Asp
96607760e1 EnderIO Wrench Support 2016-06-19 18:23:28 +02:00
Blood-Asp
183a681d52 IC2 Single-Use battery support 2016-06-19 17:36:54 +02:00
Blood-Asp
3a249d8075 Merge pull request #500 from Muramasa-/DieselGenerator
Large Diesel Generator
2016-06-19 17:12:23 +02:00
Logan Perkins
54ae577be0 Make recipe input work for split stacks 2016-06-12 10:41:52 -07:00
Muramasa
237e5e682d Possibly final commit 2016-06-01 06:34:33 +01:00
Muramasa
bbcc38e930 More fixes for #507 2016-05-25 19:16:41 +01:00