Aidan C. Brady
fc878661d5
Implemented new container edit modes in Portable Tank and Dynamic Tank, still need to set up IFluidContainerItem integration with the Dynamic Tank
2014-07-10 18:08:53 -04:00
Aidan C. Brady
12f3ef8665
Lay out the foundation for container edit modes. Also changed the way Dynamic Tank caches work - they are now much more modular and will remember their multiblock inventories on world reload.
2014-07-10 17:51:26 -04:00
Aidan C. Brady
16c5f7cdb3
Merge branch 'development' of https://github.com/aidancbrady/Mekanism into development
2014-07-10 16:25:04 -04:00
Aidan C. Brady
1f9782d1c7
Added logic to allow fluid-accepting machines to use IFluidContainerItem fluids
2014-07-10 16:24:55 -04:00
Ben Spiers
55b178b907
Revert "Start on Fusion Reactor logic and infrastructure. Currently experimenting with parameters for balance."
...
This reverts commit 7394ceda8f
.
2014-07-10 19:22:54 +01:00
Aidan C. Brady
95b6ac8be1
Merge branch 'development' of https://github.com/aidancbrady/Mekanism into development
2014-07-10 13:35:37 -04:00
Aidan C. Brady
fc138c57c2
Portable Tank now serves as a FluidContainerItem, now I just need to get fluid-accepting machines to recognize them
2014-07-10 13:30:58 -04:00
Ben Spiers
7394ceda8f
Start on Fusion Reactor logic and infrastructure. Currently experimenting with parameters for balance.
2014-07-10 16:53:01 +01:00
Ben Spiers
cd10bc88c8
Updates for changed IC2 API. Not sure if I'll be able to use @Optional with the new non-legacy BC MJ API as it uses Annotations instead of interfaces.
2014-07-10 16:53:01 +01:00
Ben Spiers
5e0dc25e2b
Update BC and IC2 APIs. Not updated Mek code to match yet.
2014-07-10 16:53:01 +01:00
Aidan C. Brady
9dc1c1d1c6
Work on a more consistent tier system. Added Reinforced Alloy, renamed Atomic Core to Atomic Alloy, and changed the recipe of the Atomic Alloy to use multiple levels of Metallurgic Infuser processing. The Reinforced Alloy is in between.
2014-07-09 23:52:01 -04:00
Aidan C. Brady
23adf9ad24
Added Salt Blocks - generates similarly to clay. Added tooltips for config GUI. Added option to regenerate ores, as this is now a thing. Also...began implementing different tiers of control circuits.
2014-07-09 22:06:36 -04:00
Aidan C. Brady
63970a29ea
Upgraded gas item recipe integration greatly, should make things much smoother.
2014-07-09 17:05:33 -04:00
Aidan C. Brady
377fff30ca
We don't really need getLocation(), instead using Coord4D.get() with the getTile() method.
2014-07-09 15:37:43 -04:00
Aidan C. Brady
ee87d8cef5
Transmitter code cleanup - killed the now-unused merge() method and separated data handlers from ITransmitterNetwork itself. Also added new pipe textures.
2014-07-09 15:31:57 -04:00
Aidan C. Brady
f405a9e2f0
Fixed transmitter recipes to more reasonable options.
2014-07-09 02:15:28 -04:00
Aidan C. Brady
df31833cb6
Tiny cleanup
2014-07-08 14:13:29 -04:00
Ben Spiers
4e32a77ac8
Fix Client/Server issues.
2014-07-07 23:33:48 +01:00
Aidan C. Brady
83ff761ec4
Fix a bug with takeTopItem() inventory management. This fixed it, @ErogenousBeef!
2014-07-07 18:21:22 -04:00
Ben Spiers
f26c49d6b4
Add a mcmod.info for development purposes.
2014-07-07 21:23:04 +01:00
Ben Spiers
df58560729
Clean up configs a lot; Fix Config GUIs. This will require people to sort out their configs on their own, as things have moved.
2014-07-07 21:23:04 +01:00
Aidan C. Brady
f67be01658
Tank-based fluid container interaction fixes. Can't figure out the data request issue.
2014-07-07 15:54:26 -04:00
Ben Spiers
8a8086af3f
Merge branch '1.7.10' into development
2014-07-07 15:45:33 +01:00
Ben Spiers
f0ad905c07
Merge branch '1.7.10' into development
...
Conflicts:
build.properties
src/main/java/mekanism/common/Mekanism.java
src/main/java/mekanism/common/voice/VoiceConnection.java
2014-07-07 15:43:53 +01:00
Ben Spiers
786d399c2c
Require Forge 10.12.2.1147 or above.
2014-07-05 14:39:25 +01:00
Aidan
1914910c78
Merge pull request #1435 from BrunoLG/patch-3
...
Update pt_BR.lang
2014-07-02 18:39:39 -04:00
Ben Spiers
5e08f8110a
We can depend on APIs directly now :)
2014-06-27 20:00:10 +01:00
Ben Spiers
589d5f420f
Recommit update changes that were seemingly lost in a rebase-pull.
2014-06-27 20:00:10 +01:00
Ben Spiers
55f8dbfbad
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 20:00:10 +01:00
Ben Spiers
9383ea24b6
Add dependencies to stop some crashes.
2014-06-27 20:00:09 +01:00
Dashkal
84bed9b2b1
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 20:00:09 +01:00
Aidan C. Brady
5397de0bfa
Added a crafting recipe for rails using osmium. Thanks, casilleroatr
2014-06-27 20:00:09 +01:00
Aidan C. Brady
205a6feab5
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-27 20:00:09 +01: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
3b5438a064
Merge branch 'master' into 1.7.10
...
Conflicts:
common/mekanism/common/PacketHandler.java
2014-06-26 23:47:43 -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
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
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