aidancbrady
b248cf4b07
Fixed fluid/gas duplication
2015-11-26 14:40:46 -07:00
aidancbrady
f6154e2cb3
Fixed sorter not behaving nicely with double chests
2015-11-26 13:39:46 -07:00
aidancbrady
de839808d7
Improved chemical machines side config
2015-11-26 10:39:36 -07:00
aidancbrady
a14b0d77ad
Fixed Induction Matrix computer integration
2015-11-25 10:34:49 -07:00
aidancbrady
2640cbd50b
Fixed injection rate integration
2015-11-25 10:26:50 -07:00
aidancbrady
0313e59b8f
BuildCraft API cleanup and update
2015-11-25 10:24:45 -07:00
aidancbrady
79483d1fa7
Merge branch 'master' into development
2015-11-25 10:10:04 -07:00
aidancbrady
650224bdd8
Fixed Solar Evaporation Controller crash
2015-11-25 10:09:48 -07:00
aidancbrady
40f7373819
Fixed a small crash
2015-11-25 08:48:05 -07:00
aidancbrady
ef6d62294d
Cleanup
2015-11-25 08:43:08 -07:00
aidancbrady
57eaa5d154
Fixed a small bin issue
2015-11-20 10:41:36 -05:00
Tim Stableford
ef62f57836
Fix for CC peripherals always throwing error.
2015-11-06 18:31:27 +00:00
Aidan
8ecf0a74a8
Merge pull request #2950 from shadowfacts/sync-xp
...
Force the player's experience to sync when changing dimensions
2015-11-03 21:24:10 -05:00
Shadowfacts
4e87e281c9
Force the player's experience to sync when changing dimensions
...
(Thank you, @Gebatzens)
Fixes #2943
Also add misc IDEA files to .gitignore
2015-09-06 13:23:19 -04:00
Vexatos
d0046e97ab
Update de_DE.lang
2015-08-31 16:45:14 +02:00
Ben Spiers
4040a57a16
Oops
2015-07-28 18:53:29 +01:00
Ben Spiers
9a3f0ae633
Version Number Update: 8.1.7
2015-07-28 18:46:00 +01:00
Ben Spiers
51f1c68f05
Fix Sided Inventories with the logistical sorter
2015-07-28 18:26:17 +01:00
Ben Spiers
c9f51bd970
Update some MekanismUtils functions to use Coord4D
2015-07-28 04:58:04 +01:00
Yip Rui Fung
9cb67fa054
Fix StackSearcher using variable side before initializing it. Fixes #2844
2015-07-26 15:24:59 +08:00
Yip Rui Fung
4bf799e37d
Fix AE2 P2P registration.
2015-07-25 10:20:06 +08:00
Yip Rui Fung
766f0d5302
Fix bin crash when interacting with empty hand.
2015-07-25 08:59:25 +08:00
ruifung
d9cc8fe157
Register transmitter items with AE2 P2P
...
So the respective transmitters can be used to attune a AE2 P2P bus.
Please tell me if I'm missing anything on the mekanism side.
2015-07-23 18:23:56 +08:00
aidancbrady
4001b06b49
Merge branch 'development' of https://github.com/aidancbrady/Mekanism into development
2015-07-22 15:43:53 -07:00
aidancbrady
4e46fa4c5f
no message
2015-07-22 15:43:47 -07:00
Ben Spiers
53d8522d42
Make a change to prevent networks leaking on chunk unload.
...
It seems to have fixed the broken pipe issue as well, please test.
2015-07-21 20:45:06 +01:00
Ben Spiers
22282fc838
Update BC API
2015-07-21 20:45:05 +01:00
aidancbrady
7323a13e09
Support for custom localizations, closes #2626
2015-07-20 18:48:45 -07:00
aidancbrady
9a9f77af87
Fixed a few balloon issues
2015-07-20 14:26:55 -07:00
aidancbrady
c7fe1f86eb
Cleaner CC support with a separate peripheral handler
2015-07-20 12:28:18 -07:00
aidancbrady
728e497dd1
Forgot about generators!
2015-07-20 11:58:03 -07:00
aidancbrady
ee709cc202
New computer integration for the rest of Mekanism machinery
2015-07-20 11:43:49 -07:00
aidancbrady
a94c13edc7
Implement new computer framework in primary machines
2015-07-20 11:09:44 -07:00
aidancbrady
a062ea5e9e
Merge branch 'development' of https://github.com/aidancbrady/Mekanism into development
2015-07-20 10:53:18 -07:00
aidancbrady
d39536d89c
Cool new factory textures (thanks @Radviger), also a (temporarily unused) OC layer. Does this look good @Vexatos?
2015-07-20 10:53:12 -07:00
Ben Spiers
41492f5d28
Add a FakePlayer op commands.
2015-07-19 23:31:56 +01:00
Ben Spiers
74939083c8
Fix frame mods moving Teleporters with fake worlds
...
If there is no ChunkProvider, the block can't be unloaded.
2015-07-19 13:40:03 +01:00
aidancbrady
2c88357477
Merge branches 'development' and 'development' of https://github.com/aidancbrady/Mekanism into development
2015-07-18 23:57:58 -07:00
aidancbrady
6ab72698dc
Finally made my IDEA workspace happy, assets weren't being recognized for some reason
2015-07-18 23:57:50 -07:00
Ben Spiers
d5f5565694
Make the logistical sorter skip unplaceable stacks
...
Java could really do with generators/yield semantics.
2015-07-19 01:16:46 +01:00
Ben Spiers
d994f18117
Fix Railcraft engine compatibility.
...
For some reason they're not IEnergyProviders.
2015-07-18 21:53:19 +01:00
Ben Spiers
3d34b8c83f
Make it actually possible to watch transmitter log
...
Don't know how/when that broke.
2015-07-18 21:50:42 +01:00
aidancbrady
a2fb334833
IMC-based recipe removal. Wiki is updated as well :)
2015-07-14 15:59:55 -07:00
aidancbrady
a1eb8306ee
Defined redstone connections for Redstone Logic Adapters, closes #2808
2015-07-14 15:43:23 -07:00
aidancbrady
6bda8addcb
Accept power from ForgeDirection.UNKNOWN
2015-07-14 14:30:51 -07:00
aidancbrady
7799afed53
Go ahead and bump Forge to latest recommended, 1291 is looking too old
2015-07-14 14:22:27 -07:00
Aidan
b743618186
Merge pull request #2805 from halvors/fix/get-pick-block
...
Update getPickBlock() to use the new non-deprecated version.
2015-07-08 09:28:44 -07:00
aidancbrady
2021ff0f7a
Merge branch 'master' into development
2015-07-08 09:27:50 -07:00
Halvor Lyche Strandvoll
037e1e553f
Update getPickBlock() to use the new non-deprecated version.
2015-07-08 12:34:02 +02:00
Mazdallier
ea3bc94c29
Update fr_FR.lang
...
heavy water bucket and reactor logic modes
2015-07-08 12:02:02 +02:00
aidancbrady
e9fb7f164c
Fix statistics render
2015-07-06 13:58:48 -07:00
aidancbrady
87b7b838f0
Induction Matrix now caps input based on provider transfer cap, displays input rate data in both main and stats interfaces
2015-07-06 13:55:40 -07:00
aidancbrady
b01f31a65e
Added framework for restricted EIM input, improved & cleaned up CC integration
2015-07-06 13:38:08 -07:00
aidancbrady
1edec150c6
Reactor injection rate now rounds down to nearest even integer
2015-07-06 13:26:26 -07:00
aidancbrady
274b6d1477
Update copyright, minor cleanup
2015-07-06 11:26:48 -07:00
aidancbrady
cdd76c5edd
Merge branch 'development' of https://github.com/aidancbrady/Mekanism into development
2015-07-06 08:47:07 -07:00
aidancbrady
19ccc2c025
Added CC integration to Laser Amplifiers
2015-07-06 08:44:43 -07:00
Aidan
6b90802f8f
Merge pull request #2789 from halvors/development
...
Added the default transparent greyed out background to GuiScreen's.
2015-07-02 08:15:38 -07:00
Aidan
2eeee08cf2
Merge pull request #2793 from tterrag1098/master
...
Maintain java 6 source compatability in API classes
2015-07-01 23:09:14 -07:00
Halvor Lyche Strandvoll
bb6273cf86
Replaced spaces with tabs in GuiPasswordEnter and GuiPasswordModify.
2015-07-02 07:21:58 +02:00
Halvor Lyche Strandvoll
37b011c327
Added the default transparent greyed out background to GuiScreen's.
...
Added the default transparent greyed out background to the
GuiPasswordEnter and GuiPasswordModify GuiScreen's.
2015-07-01 15:47:11 +02:00
aidancbrady
e86df43477
Configurable gas storage capacities for flamethrower, jetpack & scuba tank
2015-06-30 15:01:14 -07:00
aidancbrady
8fb0209a11
Added new crusher BioFuel recipes
2015-06-30 14:54:04 -07:00
tterrag1098
d85dfd4f31
Maintain java 6 source compatability in API classes
2015-06-30 00:48:05 -04:00
aidancbrady
77db81bcf0
Added fake player readout, closes #2771
2015-06-29 10:45:39 -07:00
aidancbrady
d879ffc066
Fixed FuelHandler crash
2015-06-29 10:30:52 -07:00
aidancbrady
7607a135ce
Bump version to 8.1.6
2015-06-23 15:20:03 -07:00
aidancbrady
7a538cb76e
Added clay/brick convenience recipe
2015-06-23 15:18:10 -07:00
aidancbrady
13f27b6732
Electrolytic Separators are now super server friendly
2015-06-17 16:29:25 -04:00
aidancbrady
43b71cb8cc
Attempt another Dynamic Tank fix
2015-06-17 15:54:01 -04:00
aidancbrady
6bdbb41b2d
Attempt a packet log check
2015-06-17 15:30:52 -04:00
aidancbrady
ace9dec4df
Better packet logging, specifically for the more CPU intensive packets
2015-06-17 15:17:09 -04:00
aidancbrady
838ad33756
Packet logging
2015-06-17 15:04:07 -04:00
aidancbrady
c67bbde36a
Fixed Balloon render on player entities
2015-06-17 13:53:30 -04:00
aidancbrady
b9f80c0365
Dynamic Tanks are now server friendly, closes #2690
2015-06-17 13:26:47 -04:00
aidancbrady
81511d3800
Doubled base Solar Evaporation Plant processing rate and added config property, double check transporter paths to prevent bad calculations
2015-06-16 20:42:46 -04:00
aidancbrady
42ce42aee2
Moved debug reference to MekanismAPI, fixed RC recipe
2015-06-15 12:39:48 -04:00
aidancbrady
96034259ac
Lowered Solar Evaporation Plant heat loss
2015-06-13 21:26:26 -04:00
aidancbrady
26409dd0b3
Fixed reactor blocks not dropping
2015-06-13 16:08:47 -04:00
aidancbrady
a382280be5
Don't spam console with transmitter logs unless debug is on
2015-06-13 14:55:36 -04:00
aidancbrady
b2be7ffe42
Fixed Universal Cable IC2 interaction, Solar Evaporation Plants now cool down half as fast as they did previously, also continue to operate with internal heat at night
2015-06-13 12:39:23 -04:00
aidancbrady
ebe48abd84
Crash fix
2015-06-13 11:39:09 -04:00
aidancbrady
462c5a91b0
Fixed gauge render
2015-06-11 20:09:47 -04:00
aidancbrady
aec238dde5
Version bump, improved Rotary Condensentrator crafting recipe, made Solar Evaporation Controller use new gauge standards
2015-06-11 19:59:19 -04:00
aidancbrady
e12dd2597c
Hopefully fix a small DM issue
2015-06-06 20:47:12 -04:00
aidancbrady
03727deda8
Reactor Logic Adapter now is solid
2015-06-05 11:59:30 -04:00
aidancbrady
3df1750f82
Stacked Electric Chests can now open
2015-06-05 10:08:15 -04:00
aidancbrady
f5979e26bc
Fixed Purification Chamber issue
2015-06-05 09:56:21 -04:00
aidancbrady
55407e43a9
Added a config entry allowing operators to bypass restrictions
2015-06-05 09:47:59 -04:00
aidancbrady
08de0ba743
Fixed a small inventory bug
2015-06-04 01:17:49 -04:00
aidancbrady
374a7e95b5
Reactor Frames and Ports are now solid
2015-05-31 00:02:15 -04:00
aidancbrady
3cd05489d9
Bump version to 8.1.4
2015-05-29 23:19:43 -04:00
aidancbrady
6b765d27e7
Fixed inject usage of Chemical Dissolution Chamber
2015-05-28 16:48:58 -04:00
aidancbrady
c2f7735115
Fixed a Bin issue
2015-05-28 16:43:01 -04:00
aidancbrady
1b41d04b93
Prevent bins from stacking
2015-05-28 16:39:57 -04:00
aidancbrady
18c0159680
Removed CLR buttons from chemical processing machines in favor of new gauge dropper functionality
2015-05-28 16:34:25 -04:00
aidancbrady
917430bf5c
You can now dump any tank by shift-clicking its gauge with a gauge dropper
2015-05-28 16:27:06 -04:00
aidancbrady
b6264891f1
Fixed a small Gas Generator crash
2015-05-28 16:22:00 -04:00
aidancbrady
f95bfbb600
Fix console spam, we don't really need that anyway
2015-05-28 10:32:05 -04:00
aidancbrady
95565b38c3
Added Heavy Water Bucket!
2015-05-23 11:59:43 -04:00
aidancbrady
654bce3c7d
Fixed advanced machine item input logic
2015-05-23 11:44:19 -04:00
aidancbrady
4613dcb55f
Implemented BuildCraft style of dummy player, integrated with BlockEvent.BreakEvent in Digital Miner and Laser logic
2015-05-23 11:36:53 -04:00
aidancbrady
173be49a4a
Merge branch 'master' into development
2015-05-22 23:07:51 -04:00
aidancbrady
384bf643e0
Merge branch 'development' of https://github.com/aidancbrady/Mekanism into development
2015-05-22 13:06:51 -04:00
aidancbrady
fa71836e0d
Fixed bad cast, fixed tubes and pipes losing capacity after world load
2015-05-22 13:06:46 -04:00
tterrag1098
b70c0e015f
Remove hard dep on unnecessarily new forge version
2015-05-13 17:18:21 -04:00
Lemmmy
273955a522
Fixed Pressurised Tubes being named incorrectly in en_GB
2015-05-12 18:37:36 +01:00
aidancbrady
0b04665055
Another fluid tank fix
2015-05-11 10:42:58 -04:00
aidancbrady
1377ec88e8
Fixed circuit OreDict implementation
2015-05-10 19:45:09 -04:00
aidancbrady
6a25667b20
Added property to prevent world damage by flamethrowers & lasers
2015-05-10 19:33:28 -04:00
aidancbrady
909e80ff77
Fixed a transporter crash, don't scale Electrolytic Separator energy usage
2015-05-10 19:20:36 -04:00
aidancbrady
9ffc1bdff3
Localization fixes, part 1
2015-05-10 19:04:42 -04:00
aidancbrady
0c2707cd05
Made sparkle animation less cpu intensive
2015-05-09 18:47:34 -04:00
aidancbrady
1c8c12ee88
Fixed a small Dynamic Tank bug
2015-05-09 18:12:41 -04:00
aidancbrady
c62e27d5fd
Configurable armored jetpack resistance values, quadrupled brine production rate of SE plants
2015-05-06 08:34:04 -04:00
aidancbrady
09ba6fd8b4
Fixed block rotations
2015-05-05 10:57:34 -04:00
aidancbrady
3185f1bf22
Bumped version to 8.1.3
2015-05-05 10:45:59 -04:00
Anton
ec4691abf8
Update ru_RU.lang
2015-05-04 10:46:43 +03:00
TheVikingWarrior
314d3bd699
Update it_IT.lang
...
Finished it, but I'd like to remind you of issue https://github.com/aidancbrady/Mekanism/issues/2406 for the best translation
2015-05-02 00:36:20 +02:00
aidancbrady
a32d6f4953
A few fixes
2015-04-28 08:24:54 -07:00
aidancbrady
33ff01b436
Fixed transporters
2015-04-27 11:09:20 -07:00
aidancbrady
281836fc4a
Revert "Oops, forgot to update the miner inventory slots"
...
This reverts commit 93a1789053
.
2015-04-26 19:41:10 -07:00
aidancbrady
c839ce5697
Revert "Changes to GUI's for more flexibility & consistancy"
...
This reverts commit 61406c2b2d
.
2015-04-26 19:41:03 -07:00
aidancbrady
2cbcaf0a3b
Added Podzol recipe
2015-04-26 19:39:02 -07:00
aidancbrady
abce650fd4
Maybe fix bad transporters
2015-04-26 12:44:46 -07:00
aidancbrady
b44f7a999b
Fixed Digital Miner starting on world load
2015-04-26 12:24:49 -07:00
Aidan Brady
8030b0e057
Fixed icons, bumped Mekanism version to 8.1.2, bumped Forge to 1395, updated CB libraries
2015-04-25 13:14:10 -07:00
TehStoneMan
f8d6993f0f
Merge remote-tracking branch 'upstream/development' into development
2015-04-24 11:02:08 +10:00
TehStoneMan
93a1789053
Oops, forgot to update the miner inventory slots
2015-04-24 10:58:38 +10:00
TehStoneMan
61406c2b2d
Changes to GUI's for more flexibility & consistancy
...
First stage of changing GUI's to add flexibility to elements, and
consistancy of visual design. Not all devices have been updated yet.
2015-04-24 00:14:03 +10:00
RAWRwins254
746ed3f5d7
Fixing NPE from EnergyAcceptorWrapper.java not handling ticks that aren't related to a TileEntity.
2015-04-23 01:46:04 -05:00
Ben Spiers
5baf4605e0
Fix FluidStack now being amount-specific in its hashCode() method.
2015-04-17 18:29:57 +01:00
Ben Spiers
e6ee804686
Update forge again.
2015-04-17 18:27:41 +01:00
Ben Spiers
0919a82484
Merge branch 'master' into development
2015-04-17 18:01:03 +01:00
Ben Spiers
d8c26c3ed0
Hopefully fix some RF problems with pseudo-acceptors.
2015-04-17 17:44:02 +01:00
Aidan
f1b0410cad
Merge pull request #2551 from emperor06/CC_InductionMatrix
...
Added ComputerCraft support to Induction Matrix.
2015-04-16 17:55:20 -04:00
emperor06
447e81c1be
Added ComputerCraft support to Induction Matrix.
2015-04-16 17:35:48 +02:00
Aidan C. Brady
32a0e0ff4e
Merge branch 'master' into development
2015-04-16 11:28:14 -04:00
Yves
b9bfbad96c
Update fr_FR.lang
2015-04-16 12:29:20 +02:00
Aidan C. Brady
308233720c
Temporary fix for multiple buffer type merges
2015-04-15 12:52:07 -04:00
Aidan C. Brady
2c53ce6956
Configurator's "empty" mode now only works on Mekanism container blocks
2015-04-15 12:44:52 -04:00
Aidan C. Brady
425f0c27c3
Prevent crash when creating EnergyAcceptorWrapper
2015-04-14 10:55:38 -04:00
Aidan C. Brady
33f19cf895
Fixed a crash
2015-04-13 08:43:08 -04:00
Aidan C. Brady
36a2335350
Merge branch 'master' into development
2015-04-13 08:21:05 -04:00
Aidan C. Brady
9d76df996c
Tiny cleanup
2015-04-13 08:19:36 -04:00
Yves
1d6fc0918c
Update fr_FR.lang
2015-04-13 09:08:56 +02:00
Aidan C. Brady
c61e4c116b
Cleanup
2015-04-12 17:19:32 -04:00
Aidan C. Brady
da661af41c
Merge branch 'master' of https://github.com/aidancbrady/Mekanism
2015-04-12 17:16:21 -04:00
Aidan C. Brady
f89f3c1aaa
Fixed hash code assignment
2015-04-12 17:16:16 -04:00
Ben Spiers
03e45cc401
Back to Forge 1291.
...
Turns out I do silly things when I'm tired...
2015-04-12 03:38:33 +01:00
Ben Spiers
866abf5c8d
Fix build.
2015-04-12 00:38:28 +01:00
Ben Spiers
c23aafee9f
Should fix the NPE in updateTransmitterOnSide.
2015-04-12 00:19:49 +01:00
Ben Spiers
13221b5bf3
Remove some unused methods.
2015-04-12 00:12:18 +01:00
Ben Spiers
d73eed2865
Fix the draining issue
2015-04-12 00:09:35 +01:00
Ben Spiers
17e1cea25a
Possible fix for EnergyNet weirdness.
2015-04-11 14:27:21 +01:00
Ben Spiers
420e1619e6
Clean up some TransporterPathfinder stuff.
2015-04-10 23:55:59 +01:00
Ben Spiers
7b4404a973
Remove an unused parameter.
2015-04-10 23:55:59 +01:00
Ben Spiers
91d323ccdd
Maybe fix negative buffer issues .
2015-04-10 23:55:59 +01:00
Ben Spiers
05508b598a
Fix non-overworld dimensions.
2015-04-10 19:21:34 +01:00
Ben Spiers
5b558065fc
Might fix the NPE in FluidNetwork that @NitroxydeX was experiencing
2015-04-10 18:54:38 +01:00
Ben Spiers
468abefe17
Fix NPE on creating networks.
2015-04-10 18:39:27 +01:00
Ben Spiers
cb95cfeedd
Fix ITubeConnection acceptors that aren't IGasHandler
2015-04-10 18:39:06 +01:00
Vexatos
6bb5ff81da
Update de_DE.lang
2015-04-10 14:53:57 +02:00
Aidan C. Brady
f39d6d097d
Merge branch 'master' into development
2015-04-10 08:34:14 -04:00
Aidan C. Brady
5fec517a6d
Crash fix
2015-04-10 08:34:02 -04:00
Aidan C. Brady
174509444b
Merge branch 'development' of https://github.com/aidancbrady/Mekanism into development
2015-04-10 08:24:34 -04:00
Aidan C. Brady
a03ef85f4c
Fixed compile, bumped version to 8.1.1
2015-04-10 08:24:28 -04:00
TehStoneMan
76a21dfdf3
Merge remote-tracking branch 'upstream/development' into development
2015-04-09 11:44:38 +10:00
TehStoneMan
4d50a3503a
Changed name of Obsidian Ingot to avoid confusion with other mods
...
Changed "Obsidian Ingot" to "Refined Obsidian Ingot" as some other mods
(for example Tinker's Construct) also have obsidian ingots that are
technically a different material with a different ore dictionary entry.
2015-04-09 11:42:39 +10:00
Ben Spiers
94189a4f61
Fix Transporters with multipart.
2015-04-09 02:39:23 +01:00
Ben Spiers
4ca9456de8
Use path score to sort paths, not length.
2015-04-09 02:39:23 +01:00
Ben Spiers
36f0607d5e
Prioritise faster paths, by making cost inversely proportional to speed.
2015-04-09 02:39:23 +01:00
Aidan C. Brady
068e4b58a7
Merge branch 'development' of https://github.com/aidancbrady/Mekanism into development
2015-04-07 10:42:50 -04:00
Aidan C. Brady
12ebfe6745
ThreadSparkle is now operated in main client thread time - new safety checks will prevent serious lag anyway
2015-04-07 10:41:17 -04:00
Ben Spiers
4a2dde8f87
Fix API, put back some methods that GC uses, optimise imports in API.
2015-04-06 18:53:16 +01:00
Aidan C. Brady
034d732e15
A bit more tidying
2015-04-06 11:10:57 -04:00
Aidan C. Brady
ec7b0555c9
Cleanup
2015-04-06 11:08:57 -04:00
Aidan
841e358ce0
Merge pull request #2478 from aidancbrady/networkRefactor
...
Network Refactor
2015-04-06 11:00:45 -04:00
Aidan C. Brady
a61974a681
Cleanup
2015-04-06 10:12:59 -04:00
Ben Spiers
1997054bad
Merge branch 'development' into networkRefactor
2015-04-06 04:36:11 +01:00
Ben Spiers
f4a6fb8274
Do some things I TODOed earlier
2015-04-06 04:32:47 +01:00
Ben Spiers
d70595ad84
Fix a last few issues, and stop leaking networks on the client
2015-04-06 04:11:08 +01:00
TehStoneMan
f74acdfca6
Updated Digital Miner GUI
...
Updates to the Digital Miner config GUI to match changes to Logistical
Sorter GUI
2015-04-06 11:38:21 +10:00
Ben Spiers
c13b3b240f
Fix some bugs with LogiTransporters
2015-04-06 02:18:45 +01:00
Ben Spiers
16ce88f09a
Restore some client-side network stuff. More fixes
2015-04-06 01:29:07 +01:00
TehStoneMan
87bb257147
Merge remote-tracking branch 'upstream/development' into development
2015-04-06 08:32:36 +10:00
Aidan C. Brady
cbb8cbc0b0
Added a null check - this may fix some other issues
2015-04-05 13:02:57 -04:00
Aidan
01285fc203
Merge pull request #2475 from WhitePhoenix0/master
...
Added AmbientAccumulators.png
2015-04-05 13:00:42 -04:00
WhitePhoenix0
91423c38a8
Added temp AmbientAcculmulator.png
...
Stops the missing texture errors until this can be resolved properly.
2015-04-05 08:45:33 -07:00
TehStoneMan
293b8c08f1
Sorting buttons now work
...
Got the sorting buttons to work. Clicking on the arrow buttons on a
filter panel will now move that filter up or down in the filter list.
Without having made any changed to how filters are processed, filters
higher in the list will naturally be processed before later filters,
thereby making it like a priority system.
For example, if an item matches two filters, the higher priority filter
will take that item before the lower filter, in that way seperating a
specific item from a broader (wildcard) specified filter.
2015-04-05 23:03:56 +10:00
Kodos Atoz
22d37b14bf
Update en_US.lang
...
Added basic tooltip for the new reactor logic port. Feel free to change this as you feel.
2015-04-05 05:09:21 -05:00
TehStoneMan
50e72bc381
Merge remote-tracking branch 'upstream/development' into development
2015-04-05 08:52:06 +10:00
TehStoneMan
cb9a10cdcf
Updates to Logistical Sorter GUI
...
Add scroll wheel control to scrollbar.
Dim scrollbar when nothing to scroll.
Remove blank space when scrolled to end of list.
Add move filter up/down buttons to GUI (Not yet functional)
2015-04-04 23:34:27 +11:00
Ben Spiers
ede0015eec
Merge branch 'development' into networkRefactor
...
Conflicts:
src/main/java/mekanism/common/multipart/PartLogisticalTransporter.java
2015-04-04 02:58:26 +01:00
Ben Spiers
d29d1580bb
Fix some stuff I missed in the merge, and server-client communication.
2015-04-04 02:44:14 +01:00
Aidan C. Brady
41cfed37b7
Fixed a few crashes
2015-04-03 20:21:05 -04:00
Ben Spiers
7a2461540f
Merge branch 'development' into networkRefactor.
...
Hopefully I didn't miss anything
Conflicts:
src/main/java/mekanism/api/gas/GasNetwork.java
src/main/java/mekanism/client/render/RenderPartTransmitter.java
src/main/java/mekanism/common/EnergyNetwork.java
src/main/java/mekanism/common/FluidNetwork.java
src/main/java/mekanism/common/InventoryNetwork.java
src/main/java/mekanism/common/content/transporter/TransporterStack.java
src/main/java/mekanism/common/multipart/PartHeatTransmitter.java
src/main/java/mekanism/common/multipart/PartLogisticalTransporter.java
src/main/java/mekanism/common/multipart/PartMechanicalPipe.java
src/main/java/mekanism/common/multipart/PartPressurizedTube.java
src/main/java/mekanism/common/multipart/PartSidedPipe.java
src/main/java/mekanism/common/multipart/PartUniversalCable.java
src/main/java/mekanism/common/util/MekanismUtils.java
src/main/java/mekanism/common/util/PipeUtils.java
2015-04-03 19:45:25 +01:00
Ben Spiers
29659ad2cd
Fix some client/server stuff, and fluid networks
2015-04-03 18:04:56 +01:00
Aidan C. Brady
63f751c710
Merge branch 'master' of https://github.com/aidancbrady/Mekanism
2015-04-03 10:14:33 -04:00
mymagadsl
b423a1d2b9
Update zh_TW.lang
2015-04-02 17:48:23 +08:00
Aidan C. Brady
8d38f63f5f
Bumped version to 8.1.0
2015-04-01 23:09:27 -04:00
Ben Spiers
d14686ea2e
Work on clientsiding, acceptors and things like redstone and multipart blocking.
2015-04-02 03:22:53 +01:00
Aidan
20a91e655f
Merge pull request #2439 from Vexatos/patch-8
...
Update de_DE.lang
2015-04-01 13:10:30 -04:00
Vexatos
e12290b540
Fixed en_US.lang
2015-04-01 19:02:10 +02:00
Vexatos
1f056925cb
Update de_DE.lang
2015-04-01 19:01:27 +02:00
Vexatos
abbca5ffd1
Update de_DE.lang
2015-04-01 18:59:48 +02:00
Aidan C. Brady
1bce16b1ad
Localization fix
2015-04-01 11:09:15 -04:00
Aidan C. Brady
45895cb753
Configurable values for Mekanism tier-related properties
2015-04-01 11:06:27 -04:00
Aidan C. Brady
dc0a90921a
A few crash fixes
2015-04-01 09:06:23 -04:00
Ben Spiers
47b4eb28b4
Start on refactor of entire network system.
...
It will hopefully make networks more robust and efficient, using lessons learned since last time I rewrote large parts of it.
We can hopefully avoid Concurrent Modification issues this way, and it should be more forgiving on chunk loads as well.
Transmitter stuff is working well, next acceptors and client rendering need tobe brought in.
2015-04-01 02:42:36 +01:00
Aidan C. Brady
fe8cc9d1e0
Tiered Pressurized Tubes, better tooltips, better transmitter icons
2015-03-31 17:46:09 -04:00
Aidan C. Brady
1438d601e3
Better Mechanical Pipe textures
2015-03-31 13:44:57 -04:00
Aidan C. Brady
a5db67e2b7
Tiered Logistical Transporters
2015-03-31 11:39:10 -04:00
Vexatos
f4ec705b32
Fixed Mekanism API
2015-03-31 15:11:45 +02:00
Aidan C. Brady
413fac32fa
Logistical Transporters now render color in glass instead of frame
2015-03-31 08:47:40 -04:00
Aidan C. Brady
c85bdcd8ab
Entity Detection mode for Laser Amplifier
2015-03-30 20:18:08 -04:00
Aidan C. Brady
e4d624d8ab
Fancy new eject algorithms, should fix issues with PRC
2015-03-30 19:27:54 -04:00
Aidan C. Brady
b4c2664c5e
Work a bit on a new, dynamic ejector system
2015-03-30 08:39:37 -04:00
Aidan C. Brady
af48daf73b
When multiblenetworks of differing fluids/gasses merge, replace one, don't add up the total gas
2015-03-30 00:21:42 -04:00
Aidan C. Brady
0193e0b010
Hopefully drastically reduced necessary CPU time for transmitters when checking connections
2015-03-30 00:11:54 -04:00
Aidan C. Brady
4f29e497b4
Fixed amplifiers
2015-03-29 18:34:48 -04:00
Aidan C. Brady
f350055fab
Universal Cables can now draw energy from laser amplifiers
2015-03-29 18:29:34 -04:00
Aidan C. Brady
6ce51b0b8d
Finished Reactor Logic Adapter
2015-03-29 16:02:57 -04:00
Aidan C. Brady
7d521ea841
Logic adapter work
2015-03-29 15:23:13 -04:00
Aidan C. Brady
0f54c21cf2
More work on logic adapter
2015-03-29 14:47:09 -04:00
Aidan C. Brady
78ed108904
Merge branch 'development' into v8.1
2015-03-29 14:20:11 -04:00
Aidan C. Brady
3a6529eac5
Fixed a reactor crash
2015-03-29 14:17:39 -04:00
Aidan C. Brady
834913f5a4
Work on Reactor Logic Adapter
2015-03-29 14:17:04 -04:00
Aidan C. Brady
2af3ef79f0
Merge branch 'development' into v8.1
2015-03-29 13:28:57 -04:00
Aidan C. Brady
b055b116e5
Don't reset induction cell storage
2015-03-29 13:26:43 -04:00
Aidan C. Brady
9b1aa2099b
Started work on Reactor Logic Adapters
2015-03-29 12:50:15 -04:00
Aidan C. Brady
a87fb35c2c
Merge branch 'master' into development
2015-03-29 11:02:47 -04:00
Aidan C. Brady
1c7f7a09ac
Energy Cubes now use old localization standards
2015-03-29 11:01:54 -04:00
Aidan C. Brady
61735a27aa
Fixed Solar Neutron Activator not rendering in inventory, fixed Solar Neutron Activator replacing blocks
2015-03-29 10:49:28 -04:00
Mr-tanaka3
0f5788d7e1
Update ja_JP.lang
2015-03-29 22:04:26 +09:00
Aidan C. Brady
6ec5a0a2fe
Fixed Metallurgic Infuser output slot
2015-03-29 01:38:03 -04:00
Aidan C. Brady
9489270315
Fixed a few localization issues, fixed Electrolytic Separator dump excess mode on left tank
2015-03-29 00:54:43 -04:00
Aidan C. Brady
0c9fd9364e
Fixed usage displays of certain machinery
2015-03-29 00:42:40 -04:00
Aidan C. Brady
cd323920fe
Fixed Crusher texture
2015-03-29 00:12:49 -04:00
Aidan C. Brady
2605751af0
Added some nicer tooltips to Oredictionificator interfaces
2015-03-28 23:51:38 -04:00
Aidan C. Brady
ac41365c86
Fixed "dump excess mode" making gas levels jump up and down, fixed a few particles issues
2015-03-28 21:44:18 -04:00
Aidan C. Brady
f10a352230
Fixed Diversion Transporter not updating surroundings when changing diverter mode
2015-03-28 21:12:34 -04:00
Aidan C. Brady
0b1b78d5a6
Fixed Restrictive Transporter render in both item and block form
2015-03-28 21:09:07 -04:00
Aidan C. Brady
5da4a522cb
A few Portable Teleporter fixes
2015-03-28 20:34:57 -04:00
Aidan C. Brady
3e4fe02449
Fixed Teleporter Frame asset
2015-03-28 17:41:48 -04:00
Aidan C. Brady
1fbf9f1568
Merged
2015-03-28 17:34:47 -04:00
Aidan C. Brady
542b995b3b
Electric Pump and Fluidic Plenisher now have CC support for resetting their calculations
2015-03-28 17:27:43 -04:00
Aidan C. Brady
f2d9049a2e
Flamethrower now only sets blocks to fire on server
2015-03-28 17:10:55 -04:00
Aidan C. Brady
07d0c2bfc1
Hopefully fixed negative buffer issue
2015-03-27 17:09:23 -04:00
Aidan C. Brady
543d45d57a
Fixed a few models, fixed a crash
2015-03-27 13:09:41 -04:00