Aidan
1914910c78
Merge pull request #1435 from BrunoLG/patch-3
...
Update pt_BR.lang
2014-07-02 18:39:39 -04:00
Ben Spiers
1f12d2a91d
PacketDataRequest.onMessage is being called on the client side in SSP. Stop that from crashing the client, but is it a problem that it's being called at all?
2014-06-27 16:20:02 +01:00
Ben Spiers
3616d19147
Add dependencies to stop some crashes.
2014-06-27 16:20:02 +01:00
Dashkal
9b3ee926e2
Port to forge-10.12.2.1121 (was 10.12.1.1112)
...
* Updated build.properties
* Now using the new OreDictionary.getoreIDs() call to obtain oreDict names
* No longer modifying OreDictionary collections in ChemicalInjectionRecipeHandler
* No longer registering list redstone under oreRedstone (causes an NPE)
2014-06-27 16:20:02 +01:00
Aidan C. Brady
de6d418697
Added a crafting recipe for rails using osmium. Thanks, casilleroatr
2014-06-27 10:56:56 -04:00
Aidan C. Brady
5b51f6b444
Merge branch 'master' into development
...
Conflicts:
common/mekanism/common/PacketHandler.java
2014-06-26 23:48:33 -04:00
Aidan C. Brady
7ca2090bc7
Revert "Update to 1.7.10. Thanks for getting the API stuff set up, @unpairedbracket, I'm using Forge 1152 now."
...
This reverts commit 604f138f71
2014-06-26 23:43:35 -04:00
Aidan C. Brady
604f138f71
Update to 1.7.10. Thanks for getting the API stuff set up, @unpairedbracket, I'm using Forge 1152 now.
2014-06-26 23:40:02 -04:00
Ben Spiers
4d0f276e55
Fix a server crash relating to a client-side only class initialization (credit to @kosakriszi). Closes #1442 .
2014-06-27 03:25:47 +01:00
Ben Spiers
ff1b3b792e
Config GUIs are cool.
2014-06-27 03:22:46 +01:00
Ben Spiers
ac223c8df5
Fix ic2 pulling and IConfigurable passthrough (leaving the OreDict fix for the Pull Request). getConnectedOutputters was broken.
2014-06-26 23:47:33 +01:00
Ben Spiers
3a027d0ef4
Aaaaaaand ComputerCraft.
2014-06-26 21:07:46 +01:00
Ben Spiers
f463416c0c
Metallurgy was easier than expected.
2014-06-26 20:18:03 +01:00
Ben Spiers
26463711de
Galacticraft and MFR API Optional-ing
2014-06-26 20:17:45 +01:00
Ben Spiers
8ddda5d0dc
BuildCraft now also working without shipping API
2014-06-26 19:28:40 +01:00
Ben Spiers
611d4c8f52
Got some IC2 stuff working now. Turns out I was being stupid.
2014-06-26 18:18:18 +01:00
Aidan C. Brady
ab07313573
Merge branch 'development' of https://github.com/aidancbrady/Mekanism into development
2014-06-26 01:20:15 -04:00
Aidan C. Brady
bc3636aaec
Quick cleanup
2014-06-26 01:20:09 -04:00
Ben Spiers
9c58ed549f
Start of work on Doing It Right™. Appears to work for cofh's API, not yet for IC2 or BC. Not sure why. Might have to ask @cpw.
2014-06-26 01:10:53 +01:00
Ben Spiers
82a708c7b2
Remove bits of APIs that are unneeded. First step in attempting to Do It Right™
2014-06-24 20:33:25 +01:00
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
