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
Aidan
30a449907d
Merge pull request #2579 from RAWRwins254/development
2015-04-23 13:00:43 -04: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
Aidan
73ddd32eca
Merge pull request #2547 from Mazdallier/patch-2
...
Update fr_FR.lang
2015-04-16 11:27:49 -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
ab1e05c2f6
Merge pull request #2517 from Mazdallier/patch-1
...
Update fr_FR.lang
2015-04-13 08:20:48 -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
75b41170d3
Merge branch 'master' into development
2015-04-12 00:13:13 +01:00
Ben Spiers
66ce6c6827
Update dependencies.
2015-04-12 00:12:40 +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
d3c9e73aa7
Possible fix for EnergyNet weirdness.
2015-04-11 14:28:05 +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
Aidan
4aad2e5364
Merge pull request #2494 from Vexatos/patch-10
2015-04-10 08:59:20 -04: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
Aidan
e6519da9b5
Merge pull request #2490 from TehStoneMan/development
...
Development
2015-04-09 10:29:14 -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
