Muramasa
|
1c195f5aab
|
Merge branch 'refs/heads/Blood-Asp/experimental' into Bugfixes
|
2016-09-13 23:40:50 +01:00 |
|
Muramasa
|
55133748f1
|
Fixes #561
|
2016-08-22 16:49:25 +01:00 |
|
Muramasa
|
29ebfa577c
|
Fixes #599
|
2016-08-22 16:47:43 +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
|
25fe49f9c5
|
Bugfixes 6 fix: missed a file
|
2016-08-14 07:25:18 +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
|
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 |
|