Commit graph

986 commits

Author SHA1 Message Date
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
Blood-Asp
e6ecf4f298 Merge pull request #597 from Muramasa-/GCOres
GC Ore Support
2016-08-10 22:41:36 +02:00
Muramasa
4ee250357e GT_Block_Ores_GC Null check 2016-08-10 21:28:19 +01:00
Muramasa
1647387280 GC Ore Support 2016-08-10 21:14:53 +01:00
Blood-Asp
b3bd42ba8c Merge pull request #594 from Technus/experimental
Paintable Wires
2016-08-10 20:22:47 +02:00
Blood-Asp
fb73e62dc7 Merge pull request #586 from Muramasa-/GGMerge
Merge GalacticGreg into GT
2016-08-10 20:21:14 +02:00
Daniel
450bb19519 Paintable Wires 2016-08-07 08:39:14 +02:00
Muramasa
a1a65ef0f6 Use dim name for GC worlds. 2016-08-02 09:33:22 +01:00
Muramasa
ed89ccbc4f Remove asteroids from isGenerationAllowed 2016-08-01 15:08:11 +01:00
Muramasa
b5b8ea974f Bugs & Removal of GG's TileEntityOres 2016-07-29 20:13:02 +01:00
Muramasa
25209a4bcb Merge GG into GT 2016-07-29 18:54:45 +01:00
Blood-Asp
c8cca6390b Merge pull request #584 from OneEyeMaker/SmoothTransition
More work on deprecated heating coils.
2016-07-27 23:52:39 +02:00
Blood-Asp
c59f2e6611 Merge pull request #583 from Muramasa-/Fixes
Remove UBC Dependency
2016-07-27 23:51:41 +02:00
OneEyeMaker
be79f288a8 Added code for Pyrolyse Oven to smoothly replace deprecated coils. 2016-07-27 15:26:14 +03:00
OneEyeMaker
078a3bedde Added code for Oil Cracker to smoothly replace deprecated coils. 2016-07-27 14:59:56 +03:00
OneEyeMaker
848f84f35c Added code for Multi Smelter to smoothly replace deprecated coils. 2016-07-27 13:17:57 +03:00
OneEyeMaker
a8647b8929 Added code for Electric Blast Furnace to smoothly replace deprecated coils. 2016-07-27 13:02:12 +03:00
OneEyeMaker
fa1955f6e5 Merge pull request #4 from Blood-Asp/experimental
Update changes
2016-07-27 07:05:14 +03:00
Muramasa
33f6c84be3 Use GameRegistry 2016-07-27 04:44:32 +01:00
Muramasa
a1a25d42dd Remove UBC Dependency 2016-07-27 04:21:53 +01:00
Blood-Asp
b4bcebf458 Handle fuel value as integer 2016-07-27 01:58:32 +02:00
Blood-Asp
a35cb1084f Merge pull request #569 from OneEyeMaker/NewFeatures
New Heating coils.
2016-07-27 01:52:15 +02:00
Blood-Asp
cabd521afe Merge pull request #582 from draknyte1/FixSoundsSliders
Makes GT Sound volume adjustable via proper sliders.
2016-07-27 01:51:54 +02:00
Draknyte1
dafe88d8e8 Makes GT Sound volume adjustable via proper sliders. 2016-07-27 07:46:59 +10: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
4c20885d14 Merge pull request #3 from Blood-Asp/experimental
Update changes
2016-07-26 07:42:29 +03:00
OneEyeMaker
c4bd35d7cd Coils should be deprecated 2016-07-26 07:31:57 +03:00
Blood-Asp
3abf4381db Merge pull request #580 from Muramasa-/Fixes
Separated multiblock overlay and gui textures
2016-07-26 01:57:27 +02:00
Muramasa
16cac26b72 Separated multiblock overlay and gui textures 2016-07-26 00:52:30 +01:00
Blood-Asp
bd51aba156 Merge pull request #576 from Muramasa-/UBCSupport
UBC Support / Ore System Restructure
2016-07-26 00:56:21 +02:00
Blood-Asp
5a15ee7e4a Merge pull request #568 from DEMOOH/experimental
Fluid Filter, Reactoria, MK3 Naquadah reactor fixes
2016-07-26 00:25:25 +02:00
Muramasa
3bbd32136f Method simplification
Simplified some methods.
Fixed incorrect honey requirement for scanning forestry species.
Tweaked a tooltips.
2016-07-25 23:04:21 +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
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
d756cebd17 Fix "stone" veins
Fix an issue where an "stone" vein would override ore textures but not
other stones.
Added missing small ore for marble and basalt.
Removed wither check from Block_Stones.
2016-07-23 03:09:25 +01:00
Muramasa
2704680a2e Fix convertOre 2016-07-22 04:31:57 +01:00
Muramasa
5fe4798e6b Fix harvest level 2016-07-22 02:58:39 +01: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
1b9536c1db Merge pull request #2 from OneEyeMaker/WiresRedefinition
Redefined some wires.
2016-07-21 17:05:02 +03: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