Commit graph

2026 commits

Author SHA1 Message Date
Byron Shelden
0de28777c0 Updated the RP API to hash e853d244 2014-08-02 00:50:32 -07:00
Aidan Brady
7e378dd796 Fixed Atomic Disassembler issue 2014-07-31 18:57:18 -04:00
Aidan Brady
b2e676aabb Fixed an API issue, fixed Robit nametag not updating, fixed Sorter Mod ID filter bugginess 2014-07-31 18:41:27 -04:00
Aidan Brady
269343f9f0 Revert back to the old method of power distribution to fix BuildCraft issues. We shouldn't try to make up for other mods' bugs. 2014-07-31 18:17:03 -04:00
Aidan Brady
4a70449899 Merge branch 'master' into development 2014-07-31 18:07:58 -04:00
Aidan
56e6cbcb55 Merge pull request #1590 from Tonius/patch-1
Various fixes to jetpack-related rendering
2014-07-31 18:04:28 -04:00
Aidan
057c4d0ea8 Merge pull request #1596 from mymagadsl/patch-3
Update zh_TW.lang
2014-07-31 18:03:37 -04:00
Ben Spiers
59dab7c848 Move StackUtil to api package for not causing errors. 2014-07-31 15:58:02 +01:00
Ben Spiers
78addc3303 Stop a potential NPE in Gas Gauges. 2014-07-30 15:14:54 +01:00
Ben Spiers
2b7300bfa3 Stop a potential NPE in Gas Gauges. 2014-07-30 15:09:27 +01:00
mymagadsl
cf53322e18 Update zh_TW.lang 2014-07-30 01:24:33 +08:00
Ben Spiers
c339ee7a18 Merge branch 'master' into development 2014-07-28 17:33:09 +01:00
Ben Spiers
c97464649d Fix trying to use IC2 EnergyNet without IC2 installed. It would never work anyway. 2014-07-28 17:20:31 +01:00
Tonius
fef1fb6fb6 Committed the other files I meant to commit. 2014-07-28 15:01:58 +02:00
Tonius
d6cf9a8e90 Various fixes to rendering
Fixed:
 - Jetpack particles being too dark
 - Jetpack particles flickering towards the world origin
 - Jetpack HUD showing in almost every screen
 - RenderTickHandler still ticking when the game is paused
2014-07-28 15:01:27 +02:00
Ben Spiers
d0d660b9d4 Merge branch 'master' into development 2014-07-27 20:45:53 +01:00
Ben Spiers
1d61c3d4e8 Tweak energynet logic a bit to safeguard against overly high tiers of IC2 acceptor and things that implement everything but with only one working.
Should fix AE2 EU P2P tunnel support.
2014-07-27 20:45:13 +01:00
Aidan C. Brady
31e24ecd1e Fixed default enchantibilities 2014-07-26 19:17:02 -04:00
Aidan C. Brady
3abd80f1a2 Generators now sustain fluid and gas data 2014-07-26 19:10:17 -04:00
Aidan C. Brady
ab34edc46a Finished off new system of sustained data 2014-07-26 18:44:24 -04:00
Aidan C. Brady
94c3a6aa60 Started work on a new system of managing sustained data 2014-07-26 18:16:00 -04:00
Aidan C. Brady
7ac7fbc5cc Sustained gas and fluid support for Chemical Washer, Chemical Crystallizer and Chemical Infuser 2014-07-26 17:59:43 -04:00
Aidan C. Brady
2876eb535d Merge branch 'master' into development 2014-07-26 17:39:03 -04:00
Aidan C. Brady
ba289ced25 Added sustained fluid and gas tanks to PRC and Electrolytic Separator, fixed Gas Generator losing energy when being picked up 2014-07-26 17:37:25 -04:00
Aidan
3d1b256632 Merge pull request #1576 from fewizz/patch-1
Update ru_RU.lang
2014-07-26 15:44:17 -04:00
Aidan
e7bfdefb26 Merge pull request #1578 from jmongeon/master
Fix Gas Generator not accepting Buildcraft fuels.
2014-07-26 15:43:22 -04:00
fewizz
f768dabd5f Update ru_RU.lang 2014-07-25 12:44:54 +04:00
jmongeon
1689031219 Fix Gas Generator not accepting Buildcraft fuels. 2014-07-24 23:07:11 -04:00
Aidan C. Brady
bb8985b6f8 Fixed a few energy transfer issues 2014-07-23 13:49:42 -04:00
Aidan C. Brady
2b5bb53bc6 Fixed a few recipe issues 2014-07-23 13:43:12 -04:00
Aidan C. Brady
cdb1ad2ffe Attempted a fix for a strange connection error 2014-07-21 19:45:14 -04:00
Aidan C. Brady
b4be235f82 Merge branch 'master' into development 2014-07-21 16:59:18 -04:00
Ben Spiers
5f26402bd9 Minor cleanup and tabs 2014-07-21 21:48:28 +01:00
Aidan C. Brady
0864e1061a Merge a few more fixes 2014-07-21 16:45:08 -04:00
Aidan C. Brady
27056da3e4 Merge back a few bug fixes 2014-07-21 16:41:27 -04:00
Ben Spiers
fd9fb0713e Merge pull request #1559 from jstockwin/development
Stop energy cube core rendering when cube is empty.
2014-07-21 21:20:38 +01:00
jstockwin
0a9dbec78c Stop energy cube core rendering when cube is empty.
This will stop it from blocking out other rendering when it's not opaque
enough to be visible
2014-07-21 21:14:12 +01:00
Ben Spiers
cc33ad2181 Update Development.md
It wasn't really correct any more
2014-07-21 20:13:59 +01:00
Aidan C. Brady
545849f187 Merge branch 'master' into development 2014-07-20 15:28:18 -04:00
Aidan
db7b44edf1 Merge pull request #1547 from sb023612/master
Update zh_CN.lang
2014-07-20 11:28:11 -04:00
sb023612
7660a828b8 Update zh_CN.lang 2014-07-20 21:01:54 +08:00
sb023612
fe845c21d9 Update zh_CN.lang 2014-07-20 20:56:15 +08:00
Aidan
2e1b010e81 Merge pull request #1538 from Vexatos/patch-4
Update de_DE.lang
2014-07-18 08:34:43 -04:00
Vexatos
ad82a76a0d Update de_DE.lang 2014-07-18 09:57:03 +02:00
Aidan C. Brady
0a1afbae93 Fixed a major issue that was causing transmitter networks to be ticked twice in a single tick 2014-07-17 01:44:32 -04:00
Aidan C. Brady
cfeb08a8ee Fixed Gas Mask OP-ness, added config option to let creative mode override the Electric Chest, fixed Gas Generator crash 2014-07-16 23:53:00 -04:00
Aidan C. Brady
de1e264c68 Merge branch 'master' into development 2014-07-14 17:15:11 -04:00
Aidan C. Brady
146d974479 Fixed Teleporter localization, fixed balloons placing on non-solid sides, added AE processing recipes, improve tele porter efficiency 2014-07-14 17:14:32 -04:00
Ben Spiers
c009940140 Fix Railcraft Dependency
This is such a pain.
2014-07-14 20:47:45 +01:00
Ben Spiers
249638ef41 Fix somehow having 2 mcmod.info files in the Mekanism jar. 2014-07-14 20:41:13 +01:00