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
