tilera/Mekanism-tilera-Edition
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity
2804 commits 2 branches 0 tags 102 MiB
Commit graph

883 commits

Author SHA1 Message Date
Ben Spiers
1f2dd3162a Reorganise trait registration 2014-11-17 22:40:38 +00:00
Ben Spiers
1a8e2326b9 Get rid of IPipeTile since it wasn't working anyway. Fixes #1971, #1975 2014-11-17 22:40:18 +00:00
Ben Spiers
19fa918daa Merge branch 'development' into 1.8 2014-11-16 23:59:33 +00:00
Ben Spiers
7ab1e66d6a Merge branch 'master' into development 2014-11-16 23:58:55 +00:00
Ben Spiers
11fac12840 Should fix #1762. 2014-11-16 23:58:12 +00:00
Aidan C. Brady
a699a4b860 Merge branch 'master' into development 2014-11-16 11:45:13 -05:00
Aidan C. Brady
de5cc8c76d Merge fix changes 2014-11-16 11:45:05 -05:00
Aidan C. Brady
e54edcf4cf Another fix attempt 2014-11-16 11:43:08 -05:00
Aidan C. Brady
53b5a25558 Merge branch 'development' into 1.8 
Conflicts:
	src/main/java/mekanism/common/multipart/PartLogisticalTransporter.java
 2014-11-16 01:08:08 -05:00
Aidan C. Brady
ebb23fbfea Merge branch 'master' into development 2014-11-16 01:06:44 -05:00
Aidan C. Brady
5be57a20d6 Attempt a fix at an API bug 2014-11-16 01:06:00 -05:00
Aidan C. Brady
1b159d3242 Another cleanup 2014-11-16 01:00:41 -05:00
Aidan C. Brady
607eb31316 A few minor cleanups 2014-11-15 18:46:11 -05:00
Ben Spiers
2507bd3ecb Fix some merge dodginess. 2014-11-13 22:18:26 +00:00
Ben Spiers
c5e8c866ce Fix me being stupid. #1943 2014-11-13 19:46:41 +00:00
Ben Spiers
6872279a0e Stop UniCables claiming to carry MJ 2014-11-13 19:46:21 +00:00
Ben Spiers
ece8c6eb08 Only receive RF from sides in NORMAL mode. 
Conflicts:
	src/main/java/mekanism/common/multipart/PartUniversalCable.java
 2014-11-13 19:45:58 +00:00
Ben Spiers
224d778155 Make PULL mode actually, and exclusively, pull. 
Conflicts:
	src/main/java/mekanism/common/multipart/PartUniversalCable.java
 2014-11-13 19:43:05 +00:00
Ben Spiers
b31aa92844 Update lots of APIs, most notably BC and an actual 1.7 version of CC 
Conflicts:
	build.properties
	src/api/java/buildcraft/api/core/BlockIndex.java
	src/api/java/buildcraft/api/core/BuildCraftAPI.java
	src/api/java/buildcraft/api/fuels/IFuel.java
	src/api/java/buildcraft/api/mj/BatteryObject.java
	src/api/java/buildcraft/api/mj/IBatteryIOObject.java
	src/api/java/buildcraft/api/mj/IBatteryObject.java
	src/api/java/buildcraft/api/mj/IOMode.java
	src/api/java/buildcraft/api/mj/MjAPI.java
	src/api/java/buildcraft/api/mj/MjBattery.java
	src/api/java/buildcraft/api/power/PowerHandler.java
	src/api/java/buildcraft/api/recipes/CraftingResult.java
	src/api/java/buildcraft/api/recipes/IAssemblyRecipeManager.java
	src/api/java/buildcraft/api/recipes/IFlexibleRecipe.java
	src/api/java/buildcraft/api/recipes/IRefineryRecipeManager.java
	src/api/java/buildcraft/api/transport/IPipe.java
	src/main/java/mekanism/common/CommonProxy.java
	src/main/java/mekanism/common/EnergyNetwork.java
	src/main/java/mekanism/common/FuelHandler.java
	src/main/java/mekanism/common/Mekanism.java
	src/main/java/mekanism/common/base/IAdvancedBoundingBlock.java
	src/main/java/mekanism/common/multipart/MultipartMekanism.java
	src/main/java/mekanism/common/multipart/PartLogisticalTransporter.java
	src/main/java/mekanism/common/multipart/PartUniversalCable.java
	src/main/java/mekanism/common/network/PacketConfigSync.java
	src/main/java/mekanism/common/tile/TileEntityAdvancedBoundingBlock.java
	src/main/java/mekanism/common/tile/TileEntityElectricBlock.java
	src/main/java/mekanism/common/util/CableUtils.java
	src/main/java/mekanism/common/util/MekanismUtils.java
	src/main/java/mekanism/common/util/TransporterUtils.java
	src/main/java/mekanism/generators/common/MekanismGenerators.java
	src/main/java/mekanism/generators/common/tile/TileEntityBioGenerator.java
	src/main/java/mekanism/generators/common/tile/TileEntityGasGenerator.java
	src/main/java/mekanism/generators/common/tile/TileEntityGenerator.java
	src/main/java/mekanism/generators/common/tile/TileEntityHeatGenerator.java
	src/main/java/mekanism/generators/common/tile/TileEntitySolarGenerator.java
	src/main/java/mekanism/generators/common/tile/TileEntityWindTurbine.java
 2014-11-13 19:30:39 +00:00
Ben Spiers
64d0f8a5cc Merge branch 'master' into development 2014-11-11 12:52:27 +00:00
Ben Spiers
3a805bd948 Fix me being stupid. #1943 2014-11-11 12:51:28 +00:00
Ben Spiers
a0c492862f Merge branch 'master' into development 
Conflicts:
	src/main/java/mekanism/common/multipart/ItemGlowPanel.java
 2014-11-11 12:37:57 +00:00
Ben Spiers
8f6b24ba67 Stop UniCables claiming to carry MJ 2014-11-11 12:27:03 +00:00
Ben Spiers
0d21d201a9 Only receive RF from sides in NORMAL mode. 2014-11-11 12:25:58 +00:00
Ben Spiers
92f1579bba Make PULL mode actually, and exclusively, pull. 2014-11-11 12:25:10 +00:00
Ben Spiers
5b4f154040 Giant optimise imports. 2014-11-10 21:53:29 +00:00
Ben Spiers
4d1c1285b2 Update lots of APIs, most notably BC and an actual 1.7 version of CC 2014-11-10 21:51:37 +00:00
Aidan C. Brady
3abf36ef14 Fixes to config GUI, added new localization 2014-11-07 12:52:45 -05:00
Aidan Brady
0cccaaa415 Merge branch 'development' into 1.8 
Conflicts:
	src/main/java/mekanism/common/multipart/ItemGlowPanel.java
 2014-10-26 15:28:28 -04:00
Aidan Brady
aa103e28da Minor cleanup 2014-10-26 15:20:52 -04:00
Aidan Brady
c1f5b65cf5 Merge branch 'master' into development 2014-10-26 15:20:10 -04:00
Aidan Brady
1b665d99e2 Fixed a Portable Tank crash 2014-10-26 15:19:00 -04:00
Aidan C. Brady
10107678d1 Fixed strange glow panel issue 2014-10-17 12:03:42 -04:00
Aidan C. Brady
60bf7f5f3d Merge branch 'development' into 1.8 (gosh darn conflicts) 
Conflicts:
	src/api/java/ic2/api/Direction.java
	src/api/java/ic2/api/energy/NodeStats.java
	src/main/java/mekanism/common/Mekanism.java
	src/main/java/mekanism/common/block/BlockMachine.java
	src/main/java/mekanism/common/tile/TileEntityElectricBlock.java
	src/main/java/mekanism/common/util/MekanismUtils.java
	src/main/java/mekanism/generators/common/block/BlockGenerator.java
 2014-10-17 12:00:39 -04:00
Aidan C. Brady
d0a62c564e Merge branch 'master' into development 2014-10-17 11:48:02 -04:00
Tonius
fc83b1b837 Added NEI usage handler for infusion objects 2014-10-05 19:23:53 +02:00
Ben Spiers
92a5929c28 That was not a statement. 2014-10-02 22:16:29 +01:00
Ben Spiers
4f41f5a1df Prevent IC2 double-outputting. 2014-10-02 18:54:30 +01:00
Ben Spiers
f0b7f342b8 ElectricBlocks now output to IC2 properly. 2014-10-02 18:54:30 +01:00
Ben Spiers
3c715d906b Shuffle up EnergyNet support a bit. 
Remove the ENet's TileEntity instead of the world's one, and remove the existing one if one exists when adding the current one. Also move registration to on first tick to hopefully avoid adding too early issues. This is when IC2's delegates register so should be relatively foolproof.
Conflicts:
	src/main/java/mekanism/common/tile/TileEntityElectricBlock.java
 2014-10-02 18:54:30 +01:00
Ben Spiers
b25d8f673b Only use the EnergyNet-related interfaces if IC2 itself is loaded. 
Also add some extra safety to useIC2().
Conflicts:
	src/main/java/mekanism/common/util/MekanismUtils.java
 2014-10-02 18:54:30 +01:00
Aidan C. Brady
ed8823b038 Merge branch 'development' into 1.8 
Conflicts:
	src/main/java/mekanism/common/CommonProxy.java
	src/main/java/mekanism/common/Mekanism.java
 2014-10-02 12:47:22 -04:00
Aidan C. Brady
65ea389118 Merge branch 'master' into development 2014-10-02 11:22:31 -04:00
Aidan
26dadfe176 Merge pull request #1876 from sk89q/oredictcache-fix 
Fix some performance issues with OreDictCache
 2014-10-02 11:16:47 -04:00
TheJulianJES
ea42e52973 Fix > 3D Bow Bug 2014-10-01 17:30:32 +02:00
sk89q
16fc882da7 Change OreDictCache to hit the hash map one fewer time. 2014-09-30 13:26:34 -07:00
sk89q
125ac34c01 Use object default hashCode in ItemInfo for Item. 
Also change the hashCode() algorithm slightly.
 2014-09-30 13:24:00 -07:00
sk89q
3f6c87d8f5 Fix ItemInfo.equals() not functioning as intended. 2014-09-30 13:24:00 -07:00
Ben Spiers
5d08726880 Add config options to blacklist the different power systems. 
This should help people avoid IC2 problems with console spam, but such a "solution" only relieves the most obvious symptom of chunk-thrashing, it doesn't stop the thrashing itself.
 2014-09-30 20:40:18 +01:00
Ben Spiers
417b072c66 Hopefully stop corruption hitting gas tanks. 2014-09-30 20:24:04 +01:00
Ben Spiers
e7f3204ed7 Fix a tesseract fluid issue. 2014-09-30 20:24:04 +01:00
Aidan C. Brady
c01212aae1 Merge branch 'development' into 1.8 
Conflicts:
	src/main/java/mekanism/generators/common/MekanismGenerators.java
 2014-09-27 15:23:31 -04:00
Aidan C. Brady
94108d3e37 Made MekGen recipes more OreDict friendly 2014-09-27 15:19:53 -04:00
Aidan C. Brady
9eb9eab91d Added in a fun little silk touch multiplier config 2014-09-27 15:07:55 -04:00
Aidan C. Brady
521f7d7853 Cleanup 2014-09-27 14:44:13 -04:00
Aidan C. Brady
9bf4baab49 Merge branch 'development' into 1.8 (hopefully I didn't miss anything) 
Conflicts:
	src/main/java/mekanism/client/gui/GuiGasTank.java
	src/main/java/mekanism/client/gui/GuiPortableTeleporter.java
	src/main/java/mekanism/client/gui/GuiTeleporter.java
	src/main/java/mekanism/common/CommonProxy.java
	src/main/java/mekanism/common/Mekanism.java
	src/main/java/mekanism/common/content/transporter/TransporterStack.java
 2014-09-27 14:40:25 -04:00
Aidan C. Brady
cde5755ee3 Fixed an import 2014-09-27 14:09:13 -04:00
jmongeon
5011ea1c70 Add comparator support to the GasTank (#1829). 2014-09-26 20:35:43 -04:00
Ben Spiers
d31ebf88eb Hopefully fix the Gas Generator issue for good. 2014-09-24 21:53:25 +01:00
Ben Spiers
63101ade28 Merge pull request #1854 from pwestling/add_salination_speed_config 
add config for salination plant water transformation per update
 2014-09-24 19:22:21 +01:00
Ben Spiers
68f6348c31 Merge pull request #1853 from pwestling/add_dump_excess_to_gas_tank 
add "dump excess" option to gas tank
 2014-09-24 18:26:48 +01:00
Ben Spiers
0c5fa1bd16 Merge pull request #1852 from pwestling/add_decrement_teleporter_digit 
add right click decrement functionality to teleporter digits
 2014-09-24 18:25:58 +01:00
Ben Spiers
212ae4d429 Merge pull request #1850 from pwestling/fix_transporter_respect_nbt_in_dest_inventory 
compare stack tags as well as item id
 2014-09-24 18:25:35 +01:00
Porter Westling
986e0ac1b4 add config for salination plant water transformation per update 2014-09-24 09:31:47 -07:00
Porter Westling
2cc1b96c38 add "dump excess" option to gas tank 2014-09-23 17:15:41 -07:00
Porter Westling
bb12d91f50 add right click decrement functionality to teleporter digits 2014-09-23 12:06:17 -07:00
Porter Westling
93f5c8a797 compare stack tags as well as item id 2014-09-22 15:05:16 -07:00
Porter Westling
f284886d5c read and write entire item stack using PacketHandler in TransporterStack 2014-09-22 15:02:56 -07:00
Ben Spiers
436bb7ad86 Fix PRC GUI 2014-09-16 16:22:01 +01:00
Ben Spiers
71f6d4b8d3 Make laser digging require constant illumination. 2014-09-16 02:47:54 +01:00
Ben Spiers
c12c54f9bf Make the Laser Amplifier actually satisfactorily functional. 
Redstone controls, minimum and maximum energy thresholds, and time delays all work concurrently, removing the need for distinct modes.
 2014-09-16 02:47:54 +01:00
Ben Spiers
e84f176583 Add pulse mode to redstone control. 
(I am going somewhere with this)
 2014-09-16 02:47:54 +01:00
Aidan C. Brady
999e2de8e6 Merge branch 'development' into 1.8 
Conflicts:
	src/main/java/mekanism/client/gui/GuiPRC.java
 2014-09-15 12:19:40 -04:00
Aidan
b4d3e59fa5 Merge pull request #1821 from jmongeon/GuiFixes 
A few GUI fixes
 2014-09-15 12:18:11 -04:00
Ben Spiers
4ada1ff8b7 Small laser refinements: 
* Allow slightly larger render size.
* Stop breaking blocks *just* at the end of the laser.
* Reduce default range to 64 blocks.
 2014-09-15 03:49:47 +01:00
Ben Spiers
944e288f89 Move block breaking function into LaserManager. 2014-09-15 03:47:59 +01:00
Ben Spiers
44d852ee9b I accidentally a linear autominer. 
Might make a really basic laser redirection block next - none of the refined controls of the Amplifier, none of the collection abilities of the Tractor Beam.
 2014-09-15 02:11:55 +01:00
Ben Spiers
90f2086990 Oops. 2014-09-14 23:04:09 +01:00
Ben Spiers
f7f5e77e8e Remove a couple of unused imports 2014-09-14 23:00:55 +01:00
Ben Spiers
7fd5a28d61 Lasers can dig blocks now. 
They have a tendency to set the items they drop on fire, might make a
digging-specific variant later.
 2014-09-14 22:57:59 +01:00
Ben Spiers
355209d2e3 Fix laser hardness crash 2014-09-14 22:44:45 +01:00
Ben Spiers
b29f2adc4d LASERS 2014-09-14 05:20:16 +01:00
Ben Spiers
1cfaec3692 Fix imports, key handler. 2014-09-14 05:18:35 +01:00
Ben Spiers
1ad8f62627 Merge branch 'development' into 1.8 
Conflicts:
	build.properties
	src/main/java/mekanism/client/MekanismKeyHandler.java
	src/main/java/mekanism/common/FluidNetwork.java
	src/main/java/mekanism/common/Mekanism.java
	src/main/java/mekanism/common/item/ItemBlockEnergyCube.java
	src/main/java/mekanism/common/item/ItemBlockGasTank.java
	src/main/java/mekanism/common/item/ItemBlockMachine.java
	src/main/java/mekanism/common/multipart/PartLogisticalTransporter.java
	src/main/java/mekanism/common/multipart/PartSidedPipe.java
	src/main/java/mekanism/common/util/MekanismUtils.java
	src/main/java/mekanism/generators/common/MekanismGenerators.java
	src/main/java/mekanism/tools/common/MekanismTools.java
 2014-09-14 01:36:11 +01:00
Ben Spiers
5fefe0068f Fix saving of Gas Generator Gas Tanks. 2014-09-13 23:22:15 +01:00
jmongeon
b1105fb0b0 Add energy info widget to Pressurized Reaction Chamber. 2014-09-12 04:50:49 -04:00
jmongeon
6b456fba9a Add missing energy gauge tooltip to Chemical Infuser and Chemical Oxidizer. 2014-09-12 04:38:11 -04:00
jmongeon
fb9ec04ef0 Add missing energy info tab Rotary Condensentrator Gui. 2014-09-12 02:31:34 -04:00
Ben Spiers
372705a448 Make energy upgrades affect fuel usage 2014-09-12 02:06:40 +01:00
Aidan C. Brady
c512d72b06 Increased Gas Tank's output by a factor of 16 - it now can emit 256 units of gas per tick. This should help counter the secondary energy changes. 2014-09-12 01:54:14 +01:00
Ben Spiers
83d9ecaf23 Mouse button binding fixed 
Also, make the extra info in tooltips use the sneak keybind.
 2014-09-11 04:05:45 +01:00
Ben Spiers
2326048750 Merge branch 'development' 2014-09-07 00:27:45 +01:00
Ben Spiers
c178f471f4 Cherry pick: Fix not sending tile updates 
Conflicts:
	src/main/java/mekanism/common/multipart/PartSidedPipe.java
 2014-09-07 00:26:03 +01:00
Ben Spiers
32b3a5b0ac Fix some potential NPE problems. 2014-09-07 00:15:23 +01:00
Ben Spiers
bafdb18756 Fix Gas Tanks filling from the wrong type of gas. 
(eg. in a Chemical Injection Chamber.)
 2014-09-07 00:15:00 +01:00
Ben Spiers
b75ff5d9a1 Cache all the things. 
(Provided those things are computationally expensive to recalculate, and the memory cost of caching them is less than the time cost of recalculating them each time.)
 2014-09-06 21:14:49 +01:00
Ben Spiers
3160ec0691 Cleanup imports again. 2014-09-05 18:32:54 +01:00
Ben Spiers
3c547fa0aa Fix factories and smelting. 2014-09-05 18:31:10 +01:00
Ben Spiers
3418438d6c Update version to 7.1.1 due to Configurator ehancements. 2014-09-05 16:56:45 +01:00
Ben Spiers
29c94f9dd8 Use package-info files and @API annotations. 2014-09-05 04:22:36 +01:00
Ben Spiers
573b60de04 Turns out the itemid can change on world load. 
Use the unlocalised name instead as this should be constant. Anyone using the stack size in the unlocalized name method should be shot.
 2014-09-05 04:22:04 +01:00
Ben Spiers
c7a429177b More work in the quest for greater recipe efficiency. 2014-09-05 04:20:12 +01:00
Ben Spiers
c6a77f9cfa Fix handling of Wildcarded recipes. 
Disadvantage of the new system is it does require checking exactly the metadata on ItemStacks that is in the recipe.
 2014-09-04 04:28:44 +01:00
Ben Spiers
ce6946c669 Massive recipe system overhaul. 
They should be much more efficient now (this reduced the tick time of the CI Chamber by 3-4x in my testing), due to being able to just use the HashMap's get() instead of being limited to iterating through entries. NEI integration code now a lot more readable and type-safe as well.
 2014-09-04 04:26:55 +01:00
Ben Spiers
4dd3d4ba01 I think this will prevent a potential memory leak. 2014-09-03 19:49:47 +01:00
Ben Spiers
cb1a40a137 Try and fix the mouse binding issue. 2014-09-03 19:25:29 +01:00
Ben Spiers
fab95e8900 Re-organise imports. 
I went for what seemed like a good level of organisation:

Java
__________
Mekanism
__________
Minecraft
Forge
FML
__________
Netty
LWJGL
__________
Other APIs
__________
Static Imports.
 2014-09-03 19:00:03 +01:00
Ben Spiers
3c62d8d7c7 Fix some machine bugs. 2014-09-03 18:25:06 +01:00
Ben Spiers
c7057114bc Add a machine that slowly collects the ambient gas of vanilla dimensions. 
It could do with a model I think, something like a bellows maybe?
 2014-09-03 01:51:00 +01:00
Ben Spiers
fc8fab1987 Clean up Machine and Basic Blocks a bit. 
Got rid of the direct object equality testing, and introduce enums that we can switch through when needed.
 2014-09-03 00:09:47 +01:00
Ben Spiers
a01cf948ff Add recipe and ItemBlock to plastic barriers. 2014-09-02 20:29:09 +01:00
Ben Spiers
215cebb143 Remove unused internal class 2014-09-02 18:44:31 +01:00
Ben Spiers
8f6b0ce6de Fix Portable tank fluid setting bug 2014-09-02 18:44:31 +01:00
Ben Spiers
c21404dd2d Make the tank-type renderers reset their DisplayLists on texture reload. 
This will prevent missing-texture/wrong-texture weirdness when changing texturepacks in-world. Also noticed that two old render classes from my first rewrite of transmitter rendering are now unused, so deleted them.
 2014-09-02 18:44:31 +01:00
Aidan C. Brady
99a5702de9 Cleanup - this renderer is so pretty 2014-09-02 08:08:03 -04:00
Ben Spiers
70ef6fb873 Make the Plastic Barrier coloured. 
Still no recipe, but I'm sure we'll get to that at some point.
 2014-09-02 03:22:02 +01:00
Ben Spiers
4ea93a6fa1 Add Connected textures to the opaque reactor blocks. 
They're not very good at the moment, but they look ok.
 2014-09-01 23:22:27 +01:00
Ben Spiers
7aa2617a96 Continue the attempting to be killing the bug with the fire... 2014-09-01 20:17:55 +01:00
Ben Spiers
33de5d3967 Merge branch 'experimentalCTM' into 1.8 2014-09-01 20:05:22 +01:00
Ben Spiers
6d0f8096f0 Add in support for rendering sides with overriden textures. 
Also special facing support. Salination Plants now fully connected - the Controller texture could do with some cleaning up to improve the connected look.
 2014-09-01 20:04:00 +01:00
Ben Spiers
b1a11b0ba2 Further adapt the multiblock code. 
This will allow inter-block connected textures. I'll try and get side-specific texture overrides (eg. for the Salination Controller) working next.
 2014-09-01 18:19:21 +01:00
Ben Spiers
0be5320143 Merge branch 'development' into 1.8 
Conflicts:
	src/main/java/mekanism/common/util/MekanismUtils.java
 2014-09-01 04:10:53 +01:00
Ben Spiers
26cf0ee925 Merge branch 'master' into development 2014-09-01 04:06:47 +01:00
Ben Spiers
5ae5036e62 Replace the old connected glass renderer with one adapted from Chisel. 
I've made modifications to the original system to allow multi-meta CTM, such as between Dynamic Tanks and Dynamic Valves. This also allows texturing with effectively 5 textures, as opposed to the 47 needed previously
 2014-09-01 04:03:35 +01:00
Ben Spiers
6ffb64b740 KILL #1759 THE IMPOSSIBLE BUG KILL KILL 2014-08-31 20:30:41 +01:00
Aidan C. Brady
9224d1278a Cleanup. Great work on the sound system overhaul, @unpairedbracket! It's perfect! 2014-08-31 02:01:11 -04:00
Aidan C. Brady
ee379d7108 Added crush/enrich recipes for Fluix Dust and Crystals 2014-08-31 01:34:53 -04:00
Aidan C. Brady
98ca2315e2 Increased Gas Tank's output by a factor of 16 - it now can emit 256 units of gas per tick. This should help counter the secondary energy changes. 2014-08-30 19:29:29 -04:00
Ben Spiers
3462126f3b Oops. Missed a loop with direct emission to BC. 2014-08-30 03:55:46 +01:00
Ben Spiers
87a692a325 Fix Sorter facing calculation. 2014-08-30 03:55:46 +01:00
Ben Spiers
a8d04828ea Clean up some stuff using ForgeDirection's rotation matrix. 2014-08-30 03:55:46 +01:00
Ben Spiers
1ba5665e07 Fix indent. 2014-08-30 02:54:19 +01:00
Ben Spiers
779759ac1e Make the sound config options apply again. 2014-08-30 02:37:02 +01:00
Ben Spiers
05c7e63c55 Make shift not required to see contents of Portable Tanks. 
For convenience of NEI searching.
 2014-08-30 02:36:10 +01:00
Ben Spiers
0d77240289 Add lang utility methods to localise FluidStacks, use them throughout the codebase. 2014-08-30 02:34:50 +01:00
Ben Spiers
1215b50e06 Fix config option. 2014-08-30 01:53:29 +01:00
Ben Spiers
94ca605b48 Remove some deprecation. 2014-08-30 01:51:53 +01:00
Ben Spiers
2a52ba36af Make SoundHandler static, remove some unneeded stuff. 2014-08-30 01:51:42 +01:00
Ben Spiers
c4d1fd32f4 Found a way to reduce the nasty sound delay when rapidly toggling sounds on and off. 2014-08-30 01:08:55 +01:00
Ben Spiers
3a0d0d2208 Make the fade-in times match the old Mek sound system, give some things a fade-out of 0.5s because it sounds nice that way. 2014-08-30 01:08:05 +01:00
Ben Spiers
e83f3ee042 Merge branch 'soundsystem' into 1.8 
@aidancbrady, I got this working, might need some more refinement but
it's pretty stable
 2014-08-30 00:11:14 +01:00
Ben Spiers
9db096f9bf Pretty satisfactory implentation now, approaching point of being able to merge into 8.0. 2014-08-29 05:15:00 +01:00
Ben Spiers
c71c5d9fe7 Fix integer conversion 2014-08-29 03:14:00 +01:00
Ben Spiers
514b6962d2 Merge branch 'development' into 1.8 
Conflicts:
	src/main/java/mekanism/common/tile/TileEntitySalinationController.java
	src/main/java/mekanism/common/util/MekanismUtils.java
	src/main/java/mekanism/generators/common/block/BlockGenerator.java
 2014-08-28 22:18:31 +01:00
Ben Spiers
5d346978db Fix Sorter facing calculation. 2014-08-28 20:59:36 +01:00
Ben Spiers
e2fd40543e Clean up some stuff using ForgeDirection's rotation matrix. 2014-08-28 20:59:22 +01:00
Ben Spiers
9294719ab2 Cleanup 
Remove unused vars, add @Overrides, update deprecated methods.
 2014-08-28 20:07:51 +01:00
Ben Spiers
e3fc694532 Fix Gas Generator item gas tank restoration. 2014-08-28 20:00:56 +01:00
Ben Spiers
e16a39912e Configurator Overhaul. Modes now more accurately descriptive. 
Now only configurates in mode 0, mode 1 unchanged, mode 2 only
rotates and mode 3 acts as a buildcraft wrench.
 2014-08-28 19:59:50 +01:00
Ben Spiers
e0fc1194e1 Revert "Fix I goofed." 
This reverts commit 39509fc133.
 2014-08-28 03:29:42 +01:00
Ben Spiers
52b52e1c2e Merge branch 'development' into 1.8 
Conflicts:
	src/main/java/mekanism/common/tile/TileEntityFluidicPlenisher.java
 2014-08-28 03:29:11 +01:00
Ben Spiers
39509fc133 Fix I goofed. 2014-08-28 03:13:11 +01:00
Ben Spiers
dd3ae67750 Fix some pretty severe plenisher problems that must have gone a while relatively unnoticed. 2014-08-28 03:12:58 +01:00
Ben Spiers
be3120800f First attempt at jetpack sounds under vanilla system. Bad. 2014-08-28 02:10:09 +01:00
Ben Spiers
896c943758 Cleaning up unused stuff and 3-space tabs (?) 2014-08-27 23:55:35 +01:00
Ben Spiers
da6cbeb46d More big sound work 2014-08-27 23:16:59 +01:00
Ben Spiers
41be14fad4 Start to re-implement sound system in vanilla sounds. 
This will make us compatible with XU mufflers (when they're) fixed and
reduce unneccesary reinvention of wheels.
 2014-08-27 20:15:33 +01:00
Ben Spiers
96072e0f5e Merge branch 'development' into 1.8 2014-08-27 02:19:42 +01:00
Ben Spiers
40c06f1004 Fix secondary energy consumption with speed upgrades. 
Might make them less efficient with speed upgrades and add a secondary
energy upgrade that mitigates this, like the current energy upgrade.
 2014-08-27 02:17:45 +01:00
Ben Spiers
c81da2aebe Remove unneccessary logging 2014-08-27 02:15:09 +01:00
Ben Spiers
54328ceb35 Sanify keybinds somewhat. 
ClientTickHandler was getting way out of hand.
 2014-08-27 01:22:39 +01:00
Aidan C. Brady
ec1c02d2e5 Cleanup 2014-08-25 09:00:01 -04:00
Aidan C. Brady
6714034771 Fixed RedstoneArsenal dependency 2014-08-24 16:32:20 -04:00
Aidan C. Brady
775e1fbd6d Merge branch 'development' into 1.8 
Conflicts:
	src/main/java/mekanism/common/tile/TileEntityAdvancedBoundingBlock.java
	src/main/java/mekanism/common/tile/TileEntityDigitalMiner.java
 2014-08-24 09:51:12 -04:00
Aidan C. Brady
c364496212 Fixed the evil Bounding Block crash, fixed Dynamic Tank crashing when flowing icon is null 2014-08-24 09:46:38 -04:00
Aidan C. Brady
649f5b0867 Fixed a few GUI bugs 2014-08-23 15:46:13 -04:00
Aidan C. Brady
b6b6276346 Laid foundation for Industrial Turbine and Thermoelectric Boiler 2014-08-23 11:41:35 -04:00
Aidan C. Brady
2383e0477b Merge branch 'development' into 1.8 2014-08-23 11:07:21 -04:00
Aidan C. Brady
bbef6aa2b9 A couple crash fixes 2014-08-23 11:07:03 -04:00
Aidan C. Brady
66971fd753 Implemented the new changes into TankUpdateProtocol 2014-08-22 23:12:01 -04:00
Aidan C. Brady
7e6be317af Added prefab classes for UpdateProtocol and ThreadMultiblockSparkle, still yet to get the Dynamic Tank to extend them 2014-08-22 18:34:19 -04:00
Aidan C. Brady
8cae029ed7 Created a new prefab TileEntityMultiblock class and merged all Dynamic Tank multiblock-specific code into it. 
Should make it much easier to create the new Steam Boiler and Steam Turbine!
 2014-08-22 16:17:16 -04:00
Aidan C. Brady
55e70d5f5c Removed println 2014-08-21 20:48:23 -04:00
Aidan C. Brady
f87cc4a1e3 Logistical Transporter path caching. 
I managed to take the average path calculation time down from 4-8 milliseconds to 100-200 microseconds. All in a day's work!
 2014-08-21 20:46:51 -04:00
Aidan C. Brady
80021dd4c7 Work on path caching 2014-08-20 15:54:05 -04:00
Aidan C. Brady
275c7840cc Reorganized package structure to separate content from base code 2014-08-20 15:22:55 -04:00
Aidan C. Brady
7c09e9a47d Merge branch 'development' into 1.8 2014-08-20 14:38:46 -04:00
Aidan C. Brady
a0622523d1 Added check for 7.0-7.1 Bin crashes 2014-08-20 14:38:11 -04:00
Aidan C. Brady
333fcd8ef1 Added a check to prevent null world calls 2014-08-20 14:35:19 -04:00
Aidan C. Brady
baae072601 Merged the updateCapacity() fix to development 2014-08-20 14:07:54 -04:00
Aidan C. Brady
64e9996adb no message 2014-08-20 14:06:23 -04:00
Aidan C. Brady
d24eaddee4 Added in algorithm to merge both fluid and item data of Dynamic Tank multi blocks 2014-08-20 08:49:52 -04:00
Aidan C. Brady
540eed908e Added cache implementation of EIM 2014-08-20 08:27:44 -04:00
Ben Spiers
c24c11cb33 Make things like the ExtraUtils muffler actually have an effect on our machines. VERY HACKY. 2014-08-20 01:30:55 +01:00
Aidan C. Brady
6b4ef3bb50 Merge branch 'development' into 1.8 2014-08-19 19:08:47 -04:00
Aidan C. Brady
8c58a9eaed Fixed crash related to OreDictCache 2014-08-19 19:06:50 -04:00
Aidan C. Brady
833e0dc385 Began base implementation of the Energized Induction Matrix 2014-08-19 12:40:57 -04:00
Ben Spiers
6316ec5fd5 Fix the network fix (doEmit was always being called with tryAgain false). 2014-08-19 16:42:38 +01:00
Aidan C. Brady
ed11c63b4a Merge branch 'development' into 1.8 2014-08-19 08:42:04 -04:00
Aidan C. Brady
a8993cb223 Only break Logistical Sorter algorithm when items are actually sent 2014-08-19 08:35:43 -04:00
Aidan C. Brady
57452a562e Fixed a crash, also fixed the Logistical Transporter not connecting on chunk load. 
I have absolutely no idea why, but for some reason calling isBlockProvidingIndirectPowerTo() before checking connections fixes the issue. Probably something related to chunk loading.
 2014-08-18 16:10:44 -04:00
Aidan C. Brady
497af914dc Cleanup 2014-08-18 08:48:05 -04:00
Aidan C. Brady
b657c0fb55 Fixed Diversion Transporter not rendering unlit redstone torch, forced Diversion Transporter to render center 2014-08-18 08:23:25 -04:00
Aidan C. Brady
b408154e63 Merge branch '1.8' of https://github.com/aidancbrady/Mekanism into 1.8 2014-08-17 21:36:23 -04:00
Aidan C. Brady
aa2c79672b Began the actual implementation of PathfinderCache 2014-08-17 21:36:16 -04:00
Aidan Brady
13a88c64bf Merge branch 'development' into 1.8 2014-08-17 15:57:03 -04:00
Ben Spiers
db8ec6cb2e Fix energy and gas transmitters rendering without proper transparency. 2014-08-17 17:25:55 +01:00
Ben Spiers
c706d2ebb1 Fix ports not connecting and being able to reignite a hot reactor without the proper procedure. 2014-08-17 04:20:14 +01:00
Ben Spiers
090bd9b9c3 Get rid of two redundant factory methods. 2014-08-17 04:18:34 +01:00
Ben Spiers
0ac4494049 Fix Gas Networks losing all their capacity 2014-08-17 04:17:12 +01:00
Ben Spiers
a9191fad32 Fix Dissolution Chamber upgrades. 
Closes #1690
 2014-08-16 17:22:07 +01:00
Aidan C. Brady
9b46044391 Step 1 of enormous Logistical Transmitter efficiency overhaul - the recursive inventory finder algorithm has been eliminated with the use of the InventoryNetwork's consistency. 2014-08-16 02:46:07 -04:00
Aidan C. Brady
d3b5676e43 Transmitter networks now keep track of all connected sides of acceptors. This should fix many future bugs, and it will also allow me to implement a better caching system for Logistical Transporters. 2014-08-15 16:21:58 -04:00
Ben Spiers
db3c7863fe Cherry-pick: 
Reduce default hydrogen energy density to match old hydrogen generator generation, by popular demand. Add comment to avoid confusion over electrolytic separator usage.
Conflicts:
	src/main/java/mekanism/common/CommonProxy.java
 2014-08-15 03:39:16 +01:00
Ben Spiers
73f23abc84 Reduce default hydrogen energy density to match old hydrogen generator generation, by popular demand. Add comment to avoid confusion over electrolytic separator usage. 2014-08-15 03:29:49 +01:00
Ben Spiers
8f9a2d31ee Overhaul transmitter rendering, to make everything look a little nicer. Turn-offable by config in case people prefer the "classic" look. 2014-08-15 03:27:04 +01:00
Ben Spiers
3fcce24bac Move client configs to their own category, with new gui screen to match. 2014-08-15 02:58:44 +01:00
Ben Spiers
41e118ba2e Merge branch 'development' into 1.8 2014-08-14 23:37:28 +01:00
Ben Spiers
7813fad1ab Make redstone-split transmitters join correctly again. Presumably this being broken is why merge() was unused. 2014-08-14 23:30:27 +01:00
Ben Spiers
e4c2692e64 Fix not sending tile updates 2014-08-14 23:05:32 +01:00
Ben Spiers
dc922a3914 Remove two entirely unreferenced Config variables from the config class. 
logPackets is unused as well, but is still present in the config file.
Presumably got lost in the 1.7 update. @aidancbrady, should we reimplement
the functionality, or remove the option?
 2014-08-13 03:38:55 +01:00
Ben Spiers
9739068822 Make Glow Plastic microblocks glow. 2014-08-13 03:37:05 +01:00
Ben Spiers
22d80c2953 Make reinforced plastic blocks actually harder and more explosion-resistant than the others 2014-08-13 03:36:47 +01:00
Ben Spiers
ddc67b475a Microblock-enable our blocks. 
Use IMC where custom materials aren't necessary to leave as much as possible up to CB.
 2014-08-12 23:24:52 +01:00
Aidan C. Brady
9f91e0886e Gave the Upgrade Management GUI a scrollbar to allow for more than 4 upgrade types to be present in a single machine 2014-08-11 15:15:09 -04:00
Aidan C. Brady
237f2cbab5 Merge branch '1.8' of https://github.com/aidancbrady/Mekanism into 1.8 2014-08-11 12:31:51 -04:00
Aidan C. Brady
1833bc0796 Implemented InvTweaks API. @unpairedbracket, mind sorting out the @Optional stuff for this? I'm not sure how to do that with annotations. 2014-08-11 12:31:40 -04:00
Ben Spiers
60130d0616 Restrict the creative frequencies to creative-moded players. 2014-08-11 00:56:23 +01:00
Ben Spiers
84c13e098c Add creative frequencies to the entangled blocks. 
Adds the uility of being able to generate "infinite" (Integer.MAX_VALUE) amounts of fluids or gases.
 2014-08-11 00:55:48 +01:00
Aidan C. Brady
0bab2c21e6 Quick fix 2014-08-10 16:13:23 -04:00
Aidan C. Brady
ee47115b5a Finished off GuiScrollList and implemented it in the Dictionary :) 2014-08-10 16:11:29 -04:00
Aidan Brady
c38d0e4828 A bit more work 2014-08-10 00:23:26 -04:00
Aidan Brady
62743cfda7 Merge branch '1.8' of https://github.com/aidancbrady/Mekanism into 1.8 2014-08-10 00:14:19 -04:00
Aidan Brady
89bc7edc95 Started work on a scroll list GUI element 2014-08-10 00:14:12 -04:00
Ben Spiers
de880c5ab0 Make Pressurized Tubes able to pull from IGasHandlers. Hopefully I didn't screw anything up too badly. 2014-08-10 03:34:01 +01:00
Aidan Brady
c66f3a44b7 Merge branch '1.8' of https://github.com/aidancbrady/Mekanism into 1.8 2014-08-09 22:20:59 -04:00
Aidan Brady
1d6de974d3 A bit of package reorganization, added InventoryNetwork to transporters 2014-08-09 22:20:49 -04:00
Ben Spiers
191d964003 More Entanglement work. Now has a gui, can set it's frequency. 2014-08-10 02:17:02 +01:00
Aidan C. Brady
98ee002472 Merge back the network fixes 2014-08-09 13:43:59 -04:00
Aidan C. Brady
e032eb0370 Fixed the network CME (badly), also added "dustWood" as an OreDict entry for Sawdust 2014-08-09 13:42:13 -04:00
Aidan C. Brady
ef9741af7f Fixed cable functionality 2014-08-09 13:29:04 -04:00
Aidan C. Brady
a3c6b9dac2 Fixed cable functionality 2014-08-09 13:28:40 -04:00
Aidan Brady
cbc1bae8e8 Fixed a connected texture renderer bug 2014-08-08 22:43:46 -04:00
Aidan C. Brady
05a7bf3bf7 Made the statistics tab a bit neater 2014-08-08 22:35:40 -04:00
Aidan C. Brady
50ebdf930d Slot overlay no longer displays when reactor is not formed 2014-08-08 22:26:41 -04:00
Aidan C. Brady
bfddd56c3f Fixed Flamethrower positioning 2014-08-08 22:18:01 -04:00
Aidan C. Brady
3b53614bd2 Merge branch 'development' into 1.8 
Conflicts:
	src/main/java/mekanism/common/tile/TileEntityDynamicTank.java
	src/main/java/mekanism/common/tile/TileEntitySalinationValve.java
	src/main/java/mekanism/common/util/CableUtils.java
 2014-08-08 22:11:45 -04:00
Aidan C. Brady
d4039d7f4b Fix the no-update issues 2014-08-08 22:09:14 -04:00
Aidan C. Brady
ed919fa19a Fixed the no-update issues 2014-08-08 22:08:55 -04:00
Aidan Brady
a0b8ab0331 Quick cleanup 2014-08-08 21:25:59 -04:00
Aidan Brady
4d4926d0df Fixed Dynamic Tanks not updating when being filled with buckets. I knew I missed something. 2014-08-08 21:21:28 -04:00
Ben Spiers
40659dcdac Very start of a working teleportation system. Works for Energy and Fluids, probably Gases. Not Items yet. 2014-08-09 02:08:38 +01:00
Ben Spiers
f596848240 Fix some deprecation warnings 2014-08-08 23:20:30 +01:00
Ben Spiers
520bf46332 Fix my typo 2014-08-08 21:51:37 +01:00
Aidan C. Brady
76d2997a6b A quick fix 2014-08-08 15:09:42 -04:00
Aidan C. Brady
9566e25ba6 Merge branch 'development' into 1.8 
Conflicts:
	src/main/java/mekanism/common/Mekanism.java
	src/main/java/mekanism/common/util/CableUtils.java
 2014-08-08 14:46:37 -04:00
Aidan C. Brady
3523d03274 Digital Miner now mines blocks one chunk at a time - this will make the chunkloading upgrade easy. 2014-08-08 14:45:09 -04:00
Ben Spiers
cf18bc45a2 Remove unnecessary entity registrations - registerModEntity does it for us. Pray to any and all applicable supernatural entities that this solves the (EntityLivingBase)EntityBalloon crash 2014-08-08 18:25:47 +01:00
Aidan C. Brady
c04fdd4432 Started work on PathfinderCache - this will store paths that have been already calculated for later use. When a path becomes possibly invalidated, it is removed from the cache. 2014-08-08 00:13:17 -04:00
Aidan C. Brady
6ff0a147e4 More fixes 2014-08-08 00:00:33 -04:00
Aidan C. Brady
4a07fd7491 A few more fixes 2014-08-07 23:48:22 -04:00
Aidan C. Brady
312c8ef127 Push back those fixes 2014-08-07 23:45:30 -04:00
Aidan C. Brady
c040e14fdf EnergyNetwork fixes 2014-08-07 23:42:20 -04:00
Aidan C. Brady
d5508667f3 Merge branch 'development' into 1.8 
Conflicts:
	src/main/java/mekanism/common/item/ItemBlockEnergyCube.java
	src/main/java/mekanism/common/multipart/PartTransmitter.java
	src/main/java/mekanism/common/tile/TileEntityBasicMachine.java
	src/main/java/mekanism/common/tile/TileEntityBin.java
	src/main/java/mekanism/common/tile/TileEntityChargepad.java
	src/main/java/mekanism/common/tile/TileEntityChemicalCrystallizer.java
	src/main/java/mekanism/common/tile/TileEntityChemicalDissolutionChamber.java
	src/main/java/mekanism/common/tile/TileEntityChemicalInfuser.java
	src/main/java/mekanism/common/tile/TileEntityChemicalOxidizer.java
	src/main/java/mekanism/common/tile/TileEntityChemicalWasher.java
	src/main/java/mekanism/common/tile/TileEntityDigitalMiner.java
	src/main/java/mekanism/common/tile/TileEntityFactory.java
	src/main/java/mekanism/common/tile/TileEntityMetallurgicInfuser.java
	src/main/java/mekanism/common/tile/TileEntityPortableTank.java
	src/main/java/mekanism/common/tile/TileEntityRotaryCondensentrator.java
	src/main/java/mekanism/common/tile/TileEntitySeismicVibrator.java
	src/main/java/mekanism/common/tile/TileEntityTeleporter.java
	src/main/java/mekanism/generators/common/tile/TileEntityGenerator.java
 2014-08-07 23:02:11 -04:00
Aidan C. Brady
12ad58b1f9 Turns out I was sending a ton of packets to the entire player list on the server when it wasn't actually necessary at all, switched to new sendToReceivers() method 2014-08-07 22:48:35 -04:00
Aidan C. Brady
7634c29df9 Merge branch 'development' of https://github.com/aidancbrady/Mekanism into development 2014-08-07 21:33:23 -04:00
Aidan C. Brady
1fd5e498e8 Major packet improvements - trying to get on the good side of server owners. More to come. 
Instead of sending to all players in a dimension or within a defined range, packets will now only be sent to players who have the chunk loaded that the packet is being sent from on the server.
 2014-08-07 21:33:17 -04:00
Aidan Brady
81d3d53d76 Merge branch 'development' into 1.8 
Conflicts:
	src/main/java/mekanism/client/ClientTickHandler.java
	src/main/java/mekanism/common/item/ItemConfigurator.java
	src/main/java/mekanism/common/tile/TileEntityElectricPump.java
	src/main/java/mekanism/generators/client/gui/GuiSolarGenerator.java
 2014-08-07 12:29:43 -04:00
Aidan Brady
008afaf359 Merge branch 'master' into development 2014-08-07 12:21:11 -04:00
Ben Spiers
91dbb7fcd6 Add CC IPeripheralProvider to Bounding, EnergyCube and Generator blocks 2014-08-07 17:17:22 +01:00
Ben Spiers
799f49d9b6 Move to Forge block rotation implementation. 
Hopefully the configurator should rotate more stuff now and more wrenches should be able to rotate our blocks
 2014-08-07 17:17:22 +01:00
Ben Spiers
2ba639f8fc Fix running with Forestry but not BC. 2014-08-07 03:58:01 +01:00
Aidan Brady
14b40d901a Started work on Range4D for new packet system 2014-08-06 18:49:32 -04:00
Aidan Brady
78c0cc4c7c Fixed an issue where networks would be forgotten, made shift-M turn jetpack off immediately, simplified network code a bit 2014-08-06 18:25:33 -04:00
Aidan Brady
321411ee3a Fixed incorrect Advanced Solar Generator generation rate display 2014-08-06 13:56:01 -04:00
Aidan Brady
08914da371 Fixed Electric Pump lag - was able to completely eliminate system of node cleaning while boosting performance immensely 2014-08-06 13:44:59 -04:00
Aidan Brady
faad9762df Merge branch 'development' into 1.8 
Conflicts:
	build.properties
	src/main/java/mekanism/common/Mekanism.java
	src/main/java/mekanism/common/tile/TileEntityBin.java
	src/main/java/mekanism/common/tile/TileEntityFluidicPlenisher.java
	src/main/java/mekanism/generators/common/MekanismGenerators.java
	src/main/java/mekanism/generators/common/tile/TileEntityWindTurbine.java
	src/main/java/mekanism/tools/common/MekanismTools.java
 2014-08-06 12:56:37 -04:00
Aidan Brady
20dc1ae28a Bump version to 7.1.0. 2014-08-06 12:51:48 -04:00
Aidan Brady
7c8208026b Merge branch 'master' into development 2014-08-06 12:34:46 -04:00
Aidan Brady
1896a42afa Cleaned up that fix 2014-08-05 22:31:57 -04:00
Ben Spiers
a865a19340 Implement canConnectEnergy so RF cables don't connect when they shouldn't 2014-08-06 02:51:25 +01:00
Aidan C. Brady
7a67fbf7ca Fluidic Plenisher now detects block updates directly below it, and will replace the block if necessary. Will also no longer replace other source blocks. 2014-08-05 21:27:10 -04:00
Aidan C. Brady
12215490f0 Fixed a Digital Miner oversight, fixed Bins losing NBT data and allow Bins to accept items with varying item damage 2014-08-05 20:58:22 -04:00
Aidan C. Brady
06c66d5fbe Tiny cleanup 2014-08-05 17:07:09 -04:00
Aidan C. Brady
69874de9d2 Merge branch 'development' into 1.8 
Conflicts:
	src/main/java/mekanism/generators/client/gui/GuiWindTurbine.java
	src/main/java/mekanism/generators/common/GeneratorsCommonProxy.java
	src/main/java/mekanism/generators/common/MekanismGenerators.java
	src/main/java/mekanism/generators/common/tile/TileEntityHeatGenerator.java
	src/main/java/mekanism/generators/common/tile/TileEntityWindTurbine.java
 2014-08-05 17:06:29 -04:00
Aidan C. Brady
87c7d888f5 Merge branch 'master' into development 2014-08-05 16:56:02 -04:00
Aidan C. Brady
873af4be2e Cleanup 2014-08-05 16:55:55 -04:00
Aidan C. Brady
ed9db80245 Merge branch 'development' of https://github.com/aidancbrady/Mekanism into development 2014-08-05 16:53:48 -04:00
Aidan C. Brady
27b61e288a Fixed a few bugs 2014-08-05 16:53:40 -04:00
Aidan
aee18c0181 Merge pull request #1622 from bshelden/1614-powergen-config 
Added additional power generation configuration (#1164)
 2014-08-05 16:52:59 -04:00
Aidan
92cfc31223 Merge pull request #1625 from jstockwin/development 
Fixed some Electric Chest bugs
 2014-08-05 16:52:28 -04:00
Aidan C. Brady
afd3b52123 Merge branch '1.8' of https://github.com/aidancbrady/Mekanism into 1.8 2014-08-05 16:23:24 -04:00
Aidan C. Brady
dd2eb3a0fd Fixed an electric chest crash 2014-08-05 16:22:59 -04:00
Ben Spiers
6f9e13a798 Add passive and steam generation Stats to reactor. 2014-08-05 02:43:03 +01:00
Ben Spiers
dffee5a8e3 Add Statistics tab to Reactor 
Some more stats could be displayed here, regarding energy generation.
 2014-08-05 01:39:17 +01:00
Ben Spiers
12f9753ac5 Move Laser range and usage to config 2014-08-04 20:42:04 +01:00
jstockwin
8509ebab18 Stop pipes connecting to front of Heat Generator. 
Prevents Mechanical Pipes connecting to the front (energy output) side of the Heat Generator.
Currently they physically connect, leading you to assume they are
transferring the lava, however they are not as this is the energy output
side and it does not accept lava.
 2014-08-04 20:35:39 +01:00
Ben Spiers
9652b7adf6 Allow top/bottom to interact with charging slot 
Might add side configuration and ejectors and stuff later, but fixes #1281. (Sorry it took so long.)
 2014-08-04 20:15:10 +01:00
Ben Spiers
432eab1bcf Move LaserManager out of api to fix some import errors. 2014-08-04 14:10:40 +01:00
Ben Spiers
03a7252d7a Fix controller texture on items 2014-08-04 02:05:23 +01:00
Ben Spiers
fad0da2c15 Fix a deprecated method 2014-08-04 01:09:44 +01:00
Ben Spiers
2d3dda245a Get all registered fluids to show up in Portable tanks in NEI. 2014-08-04 01:08:49 +01:00
Ben Spiers
1c71614c4a Properly localise fluid names on machine blocks 2014-08-04 01:01:15 +01:00
Ben Spiers
14852b0b5d Move some more code into the Blocks and Items classes, and fix the ObjectHolder annotations. Don't think it's going to be possible to make the Tools items work with ObjectHolder (they'd need to be final fields I think) because the material enums need to be initialised first. 2014-08-03 20:27:20 +01:00
Ben Spiers
2048083e11 Fix energy cubes not coming from NEI charged 2014-08-03 20:27:20 +01:00
Ben Spiers
7c123a9fa1 Fix Factory container slot ids 2014-08-03 20:27:20 +01:00
Aidan C. Brady
04987a5626 Merge branch 'master' into development 2014-08-03 02:52:40 -04:00
Ben Spiers
32a52c5f03 Fix the BuildCraft leak quickly 
This is already solved in development branches but that commit would pull in a bunch of other stuff as well.
 2014-08-03 03:14:17 +01:00
Ben Spiers
9f0e564013 Fix some Server-side packets being sent by the client 
Conflicts:
	src/main/java/mekanism/common/tile/TileEntityEnergyCube.java
 2014-08-03 02:48:59 +01:00
jstockwin
79ce886df2 Fixed some Electric Chest bugs 
Electric Chest was not updating when it was (un)locked, meaning that
mechanical pipes would not (dis)connect and reconnect.

Also noticed that Electric Chest won't accept transporters connecting to
the bottom, which I thought was odd, however it looked intentional so I
left it alone. (..?)

Also made it so electric chests will not open if there is a solid block
above them.
 2014-08-03 01:00:16 +01:00