Commit graph

1589 commits

Author SHA1 Message Date
Johannes Gäßler
d592d19322 Fixed the collision of LCR Hypochlorous Acid recipes 2017-11-22 23:28:31 +01:00
JohannesGaessler
b87a55800f Removed NEI Large boiler fuel entry for Carbon Dust (#1295)
Fixes #1285. Invalid Burn value on Carbon dust in NEI page for Large Boiler Fuels.
2017-11-22 05:54:14 +10:00
Blood-Asp
d83d52647a
Merge pull request #1271 from SuperCoder7979/Plantball-fix
Plantball fix
2017-11-05 18:12:06 +01:00
Blood-Asp
ce4d0b705d
Merge pull request #1269 from MauveCloud/unstable
Removed oredict registration of AnyIron, AnyCopper, etc.
2017-11-05 18:11:12 +01:00
Blood-Asp
2a466bb76e
Merge pull request #1267 from redmage17/unstable
Configed Storage Blocks
2017-11-05 18:07:53 +01:00
Alkalus
e6d0d0691a Merge branch 'unstable' of https://github.com/Blood-Asp/GT5-Unofficial into unstable 2017-11-06 03:06:31 +10:00
Alkalus
042be469e9 Small change to CONTRIBUTING.md. 2017-11-06 03:06:10 +10:00
Blood-Asp
53993d67ac
Merge pull request #1261 from SuperCoder7979/unstable
Fix free tin bug by making Dimethyldichlorosilane and fix methane not outputting enough cells
2017-11-05 18:01:29 +01:00
Blood-Asp
c7851042b9
Merge pull request #1254 from Antifluxfield/overflow_fix
Fix overflow when charging ultimate battery
2017-11-05 18:00:30 +01:00
Blood-Asp
e9313b5198
Merge pull request #1251 from Antifluxfield/l10n_improve
Localization improve
2017-11-05 17:58:33 +01:00
Blood-Asp
07a0e94eec
Merge pull request #1249 from Antifluxfield/recipe_loading_fix
Fix unexpected recipe loading
2017-11-05 17:55:48 +01:00
Blood-Asp
d267fc8b8d
Merge pull request #1240 from Sirse/unstable
Added TeleporterUsingEvent.
2017-11-05 17:45:44 +01:00
Blood-Asp
471376dc70
Merge pull request #1232 from Dimach/unstable-1
Fixed small bug - basic miner cant work using battery in inner slot.
2017-11-05 17:40:05 +01:00
Blood-Asp
7982163281
Merge pull request #1230 from Antifluxfield/driller_fix
Drillers fix
2017-11-05 17:39:21 +01:00
Blood-Asp
083b6b0b2c
Merge pull request #1228 from DEMOOH/unstable
Glass fiber recipe fix
2017-11-05 17:04:57 +01:00
Blood-Asp
de7195ffc2
Merge pull request #1226 from Antifluxfield/patch-1
Fix AssLine structure check
2017-11-05 17:02:07 +01:00
Blood-Asp
3c78346bcf prevent circuit conversation/tier jump 2017-11-05 16:56:45 +01:00
Alkalus
5b5ecc71ad Added a correct CONTRIBUTING.md, removed CONTRIBUTOR.md. 2017-11-05 19:34:01 +10:00
Alkalus
7a7083bcd5 Added a CONTRIBUTOR.md which elaborates on the Issue and Pull request creation process.
Fell free to edit this as required.
2017-11-05 19:31:50 +10:00
Alkalus
c4b245af9b Added a failsafe for invalid Modular armour components. 2017-11-05 19:12:48 +10:00
SuperCoder79
a86dde4040
change compressedPlantball to plantball 2017-11-03 22:31:56 -04:00
Pranav
5067a6fe4f Fix Saplings to Plantball 2017-11-03 22:03:20 -04:00
Pranav
09cdfd27ba Revert "Fix free tin"
This reverts commit aafc8c10de.
2017-11-03 21:42:56 -04:00
Antifluxfield
0f9be5a4c9
Merge pull request #1 from Dimach/driller_fix
Fixed bug - miners digs bedrock.
2017-11-03 12:33:04 -05:00
MauveCloud
7a27c859a8 Removed oredict registration of AnyIron, AnyCopper, etc. 2017-11-02 12:46:10 -07:00
Dimach
540ddb3e09 Fixed bug - miners digs bedrock. 2017-11-02 17:27:30 +02:00
redmage17
45a2057b69 Configed Storage Blocks
Added config for removal of shapless recipes for storage blocks
2017-11-01 10:43:34 -04:00
SuperCoder79
5300d49dfb fix chloroform 2017-10-25 10:59:54 -04:00
SuperCoder79
69fa5a3698 fix free tin 2017-10-25 08:56:26 -04:00
SuperCoder79
aafc8c10de Fix free tin 2017-10-25 08:48:27 -04:00
Antifluxfield
b3e0abed70 Fix overflow when charging ultimate battery 2017-10-21 00:02:40 +08:00
Antifluxfield
ecacfddd69 l10n improve 2 2017-10-19 16:47:28 +08:00
Antifluxfield
32cea58782 l10n improve 2017-10-19 10:30:37 +08:00
Antifluxfield
15c86d4ea2 Fix 2017-10-18 17:53:59 +08:00
Antifluxfield
4e9e3db5ca Fix unexpected recipe loading 2017-10-16 14:21:18 +08:00
Alkalus
2d8df8d145 Actually fix the plunger behaviour this time. 2017-10-08 20:06:21 +10:00
Alkalus
f70c7d4046 Added documentation to updateTexture in GT_MetaTileEntity_Hatch.
Added a function to GT_Utility called addTexturePage(byte page).
Added information about who is using which texture page in GT_Block_Casings1.
Updated GT_Block_Casings5 & GT_Block_Casings8 to utilise texture page 1.
Updated Large Chemical Reactor to reflect this change, now also uses Page 1 Index 48.
Moved the Pyrolyse oven casing index from 111 to 22, which is currently unused and within the Gregtech index space.
2017-10-08 19:55:35 +10:00
Alkalus
85044d37a3 Small fix to Plunger behaviour. 2017-10-08 17:21:26 +10:00
Alkalus
c4dc585727 Made Cobble and Furnaces give sand again when macerated. 2017-10-08 17:15:55 +10:00
Alkalus
3bd71a4814 Removed a useless svg that should've been removed ages ago. 2017-10-08 13:46:32 +10:00
Antifluxfield
f5abfcefe8 The right method to find out whether the machine should break the block. 2017-10-08 02:48:49 +08:00
Sirse
7f68c17736 Added TeleporterUsingEvent.
In multiplayer players can teleport to "restricted" areas (like closed dimensions or WorldEdit regions), need to handle it.
2017-10-06 01:43:50 +07:00
Antifluxfield
4372034ff4 Rebalance EU cost 2 2017-10-02 11:31:01 +08:00
Johannes Gäßler
221f98bbcd Fixed RawStyreneButadieneRubber recipe cell amount 2017-09-26 13:59:58 +02:00
Dimach
32d4998ec6 Fixed small bug - basic miner cant work using battery in inner slot. 2017-09-25 14:01:46 +03:00
Antifluxfield
ef41455fe5 Fix wrong coordinate 2017-09-24 11:45:15 +08:00
Antifluxfield
3f0224f55f Register Reinforced Glass as GT machine casing 2017-09-23 17:14:15 +08:00
Antifluxfield
aef60bbf3b Fix wrong logic. 2017-09-22 14:06:42 +08:00
Antifluxfield
3db38a5c53 Update 2017-09-22 01:36:28 +08:00
Antifluxfield
e725c455b3 Adding Fake Player for all drills and pumps 2017-09-22 01:34:10 +08:00