BrunoLG
|
9feb98953a
|
Update pt_BR.lang
|
2014-06-24 15:51:27 -03:00 |
|
Aidan C. Brady
|
d5812b63ec
|
Merge branch 'development' of https://github.com/aidancbrady/Mekanism into development
|
2014-06-22 13:39:49 -04:00 |
|
Aidan C. Brady
|
576470784b
|
Fix OreDict registration typo
|
2014-06-22 08:48:16 -04:00 |
|
Aidan
|
4b0386f05a
|
Merge pull request #1432 from Adaptivity/patch-3
Update ru_RU.lang
|
2014-06-21 15:23:50 -04:00 |
|
Anton
|
1252cf7c80
|
Update ru_RU.lang
|
2014-06-21 22:07:56 +04:00 |
|
Aidan C. Brady
|
59df1b5c8f
|
Properly load MekanismTools configuration
|
2014-06-21 11:57:08 -04:00 |
|
Aidan C. Brady
|
b3a3dbb827
|
Corrected that fix!
|
2014-06-21 00:34:09 +02:00 |
|
Aidan C. Brady
|
62e14b3a2e
|
Fixed loop with Portable Tank push
|
2014-06-21 00:31:44 +02:00 |
|
Aidan C. Brady
|
b7a142ba6b
|
Fluidic Plenisher model!
|
2014-06-20 20:13:20 +02:00 |
|
Aidan C. Brady
|
efc72769d6
|
Fix offsets, implement some of @tterrag1098's changes
|
2014-06-19 20:47:45 +02:00 |
|
Aidan C. Brady
|
098a74600c
|
Fixed PRC NEI issue, fixed bucket not sustaining inventory, fixed a few other things
|
2014-06-19 20:33:10 +02:00 |
|
Aidan
|
28766f0da3
|
Merge pull request #1425 from dschub/oredict-fmp
Fix crash when mining BlockMultipart with Atomic Disassembler
|
2014-06-19 14:03:23 -04:00 |
|
Aidan C. Brady
|
cf1469c7da
|
Fix weird blending issue with Dynamic Glass, gave Seismic Vibrator an on texture
|
2014-06-19 15:44:08 +02:00 |
|
Aidan C. Brady
|
99c1f44db5
|
Fixed refs to refresh() method
|
2014-06-19 15:18:41 +02:00 |
|
Aidan C. Brady
|
e2dd5a09cb
|
You can now push fluids in through the bottom of a Portable Tank, and it will route to the first empty tank above!
|
2014-06-19 14:58:23 +02:00 |
|
Aidan C. Brady
|
27295670cc
|
Whoops - fixed crash. Also added recipe for Plenisher.
|
2014-06-19 14:42:11 +02:00 |
|
Aidan C. Brady
|
d9658a16bd
|
Transmitter network efficiency overhaul! Transmitter networks now only refresh acceptors on the transmitter that initiated the refresh instead of resetting the entire grid.
|
2014-06-19 14:34:57 +02:00 |
|
Aidan C. Brady
|
fba83a3634
|
Fluidic Plenisher work - just about done!
|
2014-06-19 13:57:30 +02:00 |
|
Daniel Schubert
|
df8d651c5d
|
Fix crash when mining BlockMultipart with Atomic Disassembler
|
2014-06-19 13:33:23 +02:00 |
|
Aidan C. Brady
|
90da466ca1
|
Started work on Fluidic Plenisher
|
2014-06-19 12:42:59 +02:00 |
|
Aidan C. Brady
|
55937cd7d4
|
Portable Tanks are polished as far as I can see! Also added a few missing localizations.
|
2014-06-19 02:34:49 +02:00 |
|
Aidan C. Brady
|
d7b0899f38
|
Fixed glowing tanks, fixed blend screwup when in toolbar, quick cleanup
|
2014-06-19 01:41:07 +02:00 |
|
Aidan C. Brady
|
7924531a4e
|
Dispensers can now latch balloons onto nearby entities, also working Portable Tank GUI
|
2014-06-19 01:13:23 +02:00 |
|
Aidan C. Brady
|
5852b59b50
|
Merge branch 'development' of https://github.com/aidancbrady/Mekanism into development
|
2014-06-18 21:19:13 +02:00 |
|
Aidan C. Brady
|
77207ceab1
|
A few GUI fixes
|
2014-06-18 21:18:45 +02:00 |
|
Aidan
|
a350b69f62
|
Merge pull request #1418 from dschub/armor-render
Fix armor rendering
|
2014-06-18 15:05:52 -04:00 |
|
Aidan C. Brady
|
a3784d1fe7
|
More portable tank work, mainly on GUIs
|
2014-06-18 21:05:32 +02:00 |
|
Daniel Schubert
|
61f914e2cf
|
Smooth rendering of Wind Turbine
|
2014-06-18 20:07:27 +02:00 |
|
Aidan C. Brady
|
adc8a9bc23
|
Portable Buckets...a lot more work than I thought
|
2014-06-18 19:42:57 +02:00 |
|
Daniel Schubert
|
b390808a76
|
Fix armor rendering
|
2014-06-18 14:13:07 +02:00 |
|
Aidan C. Brady
|
fd74ee5c92
|
Started work on Portable Tank
|
2014-06-18 03:01:23 +02:00 |
|
Aidan C. Brady
|
ead4af2f78
|
Fixed transporter item rendering, fixed WAILA display bug. Dispensers now eject balloon entities!
|
2014-06-17 18:21:59 +02:00 |
|
Aidan C. Brady
|
0528f1aace
|
Fix NEI offset for PRC, gave PRC a model, added specific sides for machines
|
2014-06-17 01:52:59 +02:00 |
|
Aidan
|
32303a2b46
|
Merge pull request #1414 from dschub/auto-eject-color
Fix Logistical Sorter auto-eject coloring
|
2014-06-16 11:30:02 +02:00 |
|
Daniel Schubert
|
356367a09b
|
Fix Logistical Sorter auto-eject coloring
|
2014-06-16 10:00:15 +02:00 |
|
Aidan C. Brady
|
1e643a9d6f
|
Fixed Jetpack key bindings (also fixed crash)
|
2014-06-16 02:44:33 +02:00 |
|
Aidan C. Brady
|
fbbea1b2c9
|
Key bindings no longer crash, added PRC sound effect
|
2014-06-16 02:31:45 +02:00 |
|
Aidan C. Brady
|
5fd89a7959
|
Added recipe for PRC, energy type is now controlled by server (closes #1369)
|
2014-06-16 02:09:31 +02:00 |
|
Aidan C. Brady
|
75f09adba2
|
Seismic Vibrator model
|
2014-06-16 01:50:40 +02:00 |
|
Ben Spiers
|
2663be0f5a
|
Allow Glow panels to be placed and stay in hollow covers again.
|
2014-06-15 20:26:47 +01:00 |
|
Aidan C. Brady
|
366a51e770
|
Crash fix!
|
2014-06-15 19:12:50 +02:00 |
|
Ben Spiers
|
ac6ee8514f
|
Quickly prevent NPEs in machines with empty tanks
|
2014-06-15 16:28:16 +01:00 |
|
Aidan C. Brady
|
982c7427f3
|
Fix cable dupe
|
2014-06-15 14:16:57 +02:00 |
|
Aidan C. Brady
|
4fdae8cbef
|
Cherrypicked @dschub's vein fix - thanks!
|
2014-06-15 13:40:06 +02:00 |
|
Aidan C. Brady
|
90c1c690a9
|
Updated Cofh API
|
2014-06-15 13:35:51 +02:00 |
|
Aidan C. Brady
|
6cd3ae4fea
|
Updated IC2 API, fixed paxels
|
2014-06-15 13:29:59 +02:00 |
|
Aidan C. Brady
|
f2b914e216
|
Loads of GUI/NEI work. Tomorrow I need to get overlays to render on GuiElement slots
|
2014-06-15 02:22:55 +02:00 |
|
Aidan C. Brady
|
3a81058cbd
|
Fix more transmitter render issues, also started on PRC NEI module
|
2014-06-14 19:31:24 +02:00 |
|
Aidan C. Brady
|
5c36612146
|
Updated NEI module to reflect new GUI changes, added PRC to RecipeHelper
|
2014-06-14 18:33:48 +02:00 |
|
Aidan C. Brady
|
3b99d376a4
|
Work on NEI module
|
2014-06-14 14:33:02 +02:00 |
|