Commit graph

1566 commits

Author SHA1 Message Date
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
Antifluxfield
0f9be5a4c9
Merge pull request #1 from Dimach/driller_fix
Fixed bug - miners digs bedrock.
2017-11-03 12:33:04 -05:00
Dimach
540ddb3e09 Fixed bug - miners digs bedrock. 2017-11-02 17:27:30 +02:00
Antifluxfield
15c86d4ea2 Fix 2017-10-18 17:53:59 +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
Usenkov Dmitry
7b6bbb6a7c Glass fiber recipy fix
Prevent extruder from consuming wire mold
2017-09-21 18:24:43 +03:00
Antifluxfield
9d8ac82535 Fix Ore Drill EU calculation; now Ore Drill is using DrillerBase 2017-09-21 20:34:38 +08:00
Antifluxfield
0802fdbd02 Fix Oil Drill logic; rebalance EU cost 2017-09-21 20:33:23 +08:00
Antifluxfield
c40f01930e Fix #562
Listen to the BlockEvent of Reinforced Glass and trigger the update check.
2017-09-20 00:29:49 +08:00
Blood-Asp
73662e531f Merge pull request #1218 from GTNewHorizons/updateUO
Revert acciential change to UO
2017-09-14 22:56:18 +02:00
Technus
113a4506e3 Revert acciential change to UO 2017-09-14 22:44:47 +02:00
Blood-Asp
7e50c16404 Merge pull request #1217 from Antifluxfield/patch-3
Improve i18n of machine tooltips
2017-09-14 19:34:45 +02:00
Antifluxfield
e8d172a66c Fix & Improve i18n 2017-09-15 01:29:06 +08:00
Antifluxfield
f5f8cceede Improve i18n 2017-09-15 01:28:31 +08:00
Antifluxfield
b1b8d7e782 Improve i18n 2017-09-15 01:27:32 +08:00
Antifluxfield
8faba6a054 Improve i18n of tooltip 2017-09-15 01:25:50 +08:00
Blood-Asp
673aaeaaab Merge pull request #1216 from Antifluxfield/patch-2
Fix l10n of Buffers
2017-09-14 19:02:51 +02:00
Blood-Asp
9feee334a0 Merge pull request #1215 from Antifluxfield/patch-1
Fix #1213
2017-09-14 19:01:31 +02:00
Antifluxfield
290b1fed03 Update GT_MetaTileEntity_Buffer.java
Fix Interaction_DESCRIPTION_Index_099
2017-09-14 15:16:10 +08:00
Antifluxfield
ad544bf68a Update PartP2PGTPower.java 2017-09-14 13:40:11 +08:00
Antifluxfield
bab8eb645d Fix #1213 2017-09-14 13:31:52 +08:00
Blood-Asp
5e38000ccc Add config for AE2Tunnel. Defaul off for now until fix. 2017-09-13 22:50:46 +02:00
Blood-Asp
86e1ee61c8 Merge pull request #1214 from GTNewHorizons/updateUO
Update UO
2017-09-13 22:12:18 +02:00
Technus
af5b360508 more descriptive argument name 2017-09-13 21:35:44 +02:00
Technus
d111a4f130 Optimize a bit 2017-09-13 21:34:06 +02:00
Technus
339494f8c3 cherrypick 2017-09-13 21:33:41 +02:00
Technus
264236f98f Minor change, can catch potential errors when the extraction val per tick is insane 2017-09-13 21:27:52 +02:00
Blood-Asp
4c82462138 Fix #1212 2017-09-13 01:12:50 +02:00