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 |
|
Aidan C. Brady
|
a24bd2e7ad
|
A bit of work on teleporter localization. There's something weird going on, though.
|
2014-07-14 12:57:57 -04:00 |
|
Ben Spiers
|
8d36e9a152
|
Fix a bizarre bug I introduced ages ago.
|
2014-07-14 16:23:03 +01:00 |
|
Aidan C. Brady
|
1094475344
|
Fixed teleporter crash, fixed asset issue
|
2014-07-13 23:52:17 -04:00 |
|
Aidan C. Brady
|
3fc1ec00e9
|
Merge branch 'development' of https://github.com/aidancbrady/Mekanism into development
|
2014-07-13 23:34:13 -04:00 |
|
Aidan C. Brady
|
17f8fa11da
|
Implemented robit crash fix
|
2014-07-13 23:34:01 -04:00 |
|
Aidan
|
e466808a22
|
Merge pull request #1509 from Mierzen/development
Lang file changes
|
2014-07-13 23:31:10 -04:00 |
|
Mierzen
|
24b15ee90f
|
Missed one missing tooltip (haha)
|
2014-07-13 22:16:46 +02:00 |
|
Mierzen
|
6fd14886c0
|
Language file changes:
Add missing tooltips! (Chemical oxidizer and infuser), please check!
Change "Round robin" to "Round-robin"
Make tooltips more 'square'
|
2014-07-13 21:54:47 +02:00 |
|
Mierzen
|
b650ed463d
|
Revert "Capitalize some language keys (yes, no and AD modes)"
This reverts commit 9c2582a26e.
|
2014-07-13 20:56:33 +02:00 |
|
Ben Spiers
|
d8b9ff7a20
|
Merge branch 'master' into development
|
2014-07-13 19:56:28 +01:00 |
|
Ben Spiers
|
c560bdc2e1
|
Fix a different, unrelated OreDict issue.
|
2014-07-13 19:53:41 +01:00 |
|
Ben Spiers
|
3e3bf2c25c
|
Fix Iron Dust smelting issue. Close #1478
|
2014-07-13 19:53:41 +01:00 |
|
Mierzen
|
9c2582a26e
|
Capitalize some language keys (yes, no and AD modes)
|
2014-07-13 20:21:11 +02:00 |
|
Mierzen
|
7328fd4400
|
Remove inherited language strings from en_GB and en_ZA
|
2014-07-13 20:19:08 +02:00 |
|
Aidan
|
eecfd68798
|
Merge pull request #1505 from Mierzen/master
Update en_GB, add en_ZA
|
2014-07-13 13:34:39 -04:00 |
|
Aidan
|
f92b682d0e
|
Merge pull request #1506 from Adaptivity/patch-4
Update ru_RU.lang
|
2014-07-13 13:34:27 -04:00 |
|
Anton
|
afe69a0f9f
|
Update ru_RU.lang
|
2014-07-13 18:41:16 +04:00 |
|
Mierzen
|
0872cdbf04
|
Update en_GB, add en_ZA
|
2014-07-13 13:11:00 +02:00 |
|
Ben Spiers
|
4bea4c62fd
|
Remove stray @Method
Should fix #1500
|
2014-07-13 05:06:57 +01:00 |
|
Aidan C. Brady
|
c223eabb95
|
Fixed Combiner NEI texture, fixed Cardboard Box not working
|
2014-07-12 22:52:13 -04:00 |
|
Aidan C. Brady
|
cfdaf37e4b
|
Moved MFR back into api package.
|
2014-07-12 16:10:10 -04:00 |
|
Ben Spiers
|
0758ad752b
|
Fix un-checked MFR API usage
|
2014-07-12 21:04:33 +01:00 |
|
Aidan C. Brady
|
79f27e9d11
|
Merge branch 'master' of https://github.com/aidancbrady/Mekanism
|
2014-07-12 16:02:32 -04:00 |
|
Aidan C. Brady
|
369eb012af
|
Fixed Portable Tank transfer issue, fixed inventories not being sustained, fixed Logistical Transporter crash
|
2014-07-12 16:02:21 -04:00 |
|
Ben Spiers
|
a8bfe29c8e
|
Depend on EnderIO and ExtraUtilities
If this doesn't fix it I don't know what will
|
2014-07-12 19:03:17 +01:00 |
|