Aidan
0e50db9d1a
Merge pull request #2140 from Dannerick/MyDev1
...
Fix for setting generator output when ethylene already in tank when plac...
2015-02-19 16:36:01 -05:00
Aidan C. Brady
ce29270d21
Merge branch 'master' into development
2015-02-19 16:35:09 -05:00
Aidan C. Brady
46f5a941ad
Cleanup
2015-02-19 16:34:59 -05:00
Aidan
def3d6a729
Merge pull request #2141 from Dannerick/MyDev2
...
[#2069 ] Fix for modded items being added to cardboardbox blacklist
2015-02-19 16:34:00 -05:00
Aidan C. Brady
2fe4cf290d
Merge branch 'master' into development (@unpairedbracket, make sure I did this right)
...
Conflicts:
src/main/java/mekanism/common/tile/TileEntityAdvancedElectricMachine.java
src/main/java/mekanism/common/util/MekanismUtils.java
2015-02-19 16:12:28 -05:00
Ben Spiers
17f9f88b34
Prevent Osmium Compressor and Combiner from using secondary energy upgrades.
...
Also make them deterministic again to prevent them getting stuck
2015-02-19 16:36:16 +00:00
Aidan C. Brady
cb377f88ab
Fixed duplicate method
2015-02-19 09:15:56 -05:00
Aidan C. Brady
f67c048e78
Merge branch 'master' into development
...
Conflicts:
src/main/java/mekanism/common/multipart/PartSidedPipe.java
2015-02-19 09:15:30 -05:00
Aidan C. Brady
c59b64f7c9
Merged changes
2015-02-19 09:15:00 -05:00
Aidan C. Brady
0819c0ad5f
Hopefully fixed the transmitter network halt issue. Provide feedback!
2015-02-19 09:13:03 -05:00
Aidan C. Brady
f7f4bd7243
Fixed Heat Generator burn time
2015-02-19 09:00:20 -05:00
Aidan C. Brady
b419519cc0
Chemical Infuser, Chemical Washer and Electrolytic Separator are now upgradeable
2015-02-18 19:33:03 -05:00
Brian Lewis
e842556c5b
[ #2069 ] Fix for modded items being added to cardboardbox blacklist
2015-02-18 17:30:09 -06:00
Brian Lewis
d41fec6031
Fix for setting generator output when ethylene already in tank when placed
2015-02-18 17:25:16 -06:00
Aidan C. Brady
f320aa4337
Merge branch 'master' into development
2015-02-17 21:35:01 -05:00
Aidan C. Brady
dcf7d7772a
Fixed a transporter output bug
2015-02-17 21:34:36 -05:00
Aidan C. Brady
25df777b84
Work on fusion fuel creation mechanics, allowed Chemical Washer to accept upgrades
2015-02-17 21:27:35 -05:00
Aidan C. Brady
cb2e38ec61
Merge branch 'master' into development
...
Conflicts:
src/main/java/mekanism/common/tile/TileEntityBasicBlock.java
2015-02-16 18:13:03 -05:00
Aidan C. Brady
488af7e8ae
Fixed facing updates not being sent out by machines
2015-02-16 18:12:31 -05:00
Aidan C. Brady
d33af99b87
More cleanup
2015-02-16 18:11:45 -05:00
Aidan C. Brady
548145ae02
Revert "Revert "Fix some transmitter issues.""
...
This reverts commit e9ef6c1866
.
2015-02-16 17:24:51 -05:00
Aidan C. Brady
e9ef6c1866
Revert "Fix some transmitter issues."
...
This reverts commit f63807c75a
.
2015-02-16 17:21:39 -05:00
Aidan C. Brady
03f6156d23
Minor cleanup
2015-02-16 17:20:51 -05:00
Aidan C. Brady
3561f9fe59
Merge branch 'master' into development
...
Conflicts:
src/main/java/mekanism/common/Mekanism.java
src/main/java/mekanism/generators/common/MekanismGenerators.java
src/main/java/mekanism/generators/common/tile/TileEntityGasGenerator.java
src/main/java/mekanism/tools/common/MekanismTools.java
2015-02-16 14:40:10 -05:00
Aidan
b885742690
Merge pull request #2001 from Dannerick/master
...
Fix for #1997 gasGenerators incorrectly limiting output
2015-02-16 14:32:52 -05:00
Ben Spiers
0cef749249
Actually increment the Mod classes' versions
2015-02-13 14:40:14 +00:00
Christian Ehrhardt
db4adce2a8
Shift-click items to top (fill) slot
2015-02-12 19:18:16 -06:00
Aidan C. Brady
2796a5d67b
Merge branch 'master' into development
...
Conflicts:
src/main/java/mekanism/api/transmitters/DynamicNetwork.java
src/main/java/mekanism/client/ClientTickHandler.java
2015-02-12 13:10:55 -05:00
Ben Spiers
7e08643ebd
ConcurrentHashMaps don't like null keys
2015-02-12 16:59:39 +00:00
Ben Spiers
122f4190bd
Remove some bad/unneeded imports
2015-02-12 16:42:25 +00:00
Ben Spiers
e6a4d3efb2
Screw it, let's just make these concurrent.
...
Keeping transmitters as a synchronizedSet-wrapped LinkedHashSet for now, because there isn't a ConcurrentLinkedHashSet.
2015-02-12 16:39:48 +00:00
Aidan C. Brady
0612712abe
Fixed energy cubes not outputting items
2015-02-11 08:43:32 -05:00
Aidan C. Brady
81c948f28d
Fixed capes
2015-02-11 08:36:52 -05:00
Aidan C. Brady
086dd83a57
Fixed capes
2015-02-11 08:36:40 -05:00
Aidan C. Brady
50f7df5f98
Merge branch 'development' into v8
...
Conflicts:
build.properties
src/main/java/mekanism/api/gas/GasNetwork.java
src/main/java/mekanism/api/transmitters/DynamicNetwork.java
src/main/java/mekanism/client/ClientTickHandler.java
src/main/java/mekanism/common/EnergyNetwork.java
src/main/java/mekanism/common/FluidNetwork.java
src/main/java/mekanism/common/Mekanism.java
src/main/java/mekanism/common/recipe/RecipeHandler.java
src/main/java/mekanism/generators/common/GeneratorsCommonProxy.java
src/main/java/mekanism/generators/common/MekanismGenerators.java
src/main/java/mekanism/generators/common/block/BlockGenerator.java
2015-02-10 18:39:15 -05:00
Aidan C. Brady
d8e12ca8d2
Merge branch 'development' into v8
...
Conflicts:
src/main/java/mekanism/common/multipart/PartLogisticalTransporter.java
src/main/java/mekanism/generators/common/block/BlockGenerator.java
2015-02-10 11:38:13 -05:00
Ben Spiers
3e38ac37f4
This feature request has been more trouble than it's worth.
2015-01-19 12:16:04 +00:00
Ben Spiers
2ced2e3860
Fix the bad implementation of the ambient lighting toggle
2015-01-19 12:07:54 +00:00
Ben Spiers
1f9185dd01
Make the gas mask and jetpack maps synchronized
2015-01-10 18:17:17 +00:00
Ben Spiers
89be8b4482
Fix using localised names for overlay textures.
2015-01-10 17:47:16 +00:00
Ben Spiers
b8b49db104
It seems the Heat Transfer equations I'm using are a bit stiff.
...
Adjust some paramaters some to improve how well we deal with this.
2015-01-09 02:50:18 +00:00
Ben Spiers
385a1d29f6
Make a start on the boiler.
...
It's currently causing odd issues with the heat simulator and has various issues such as balance not existing yet.
Also improve the specification of a load of the multiblock generics to reduce needless casting.
2015-01-08 05:26:53 +00:00
Ben Spiers
c0db6b7eb5
Fix #2075 , hopefully.
2015-01-07 23:58:23 +00:00
Ben Spiers
41cf1a2437
Move a bunch of registrations to PreInit.
...
I believe they should be happening there in the first place.
2015-01-07 23:13:45 +00:00
Ben Spiers
4b75a2f6a2
Hopefully improve the synchronization of the networks' transmitter sets
2015-01-07 23:13:10 +00:00
Ben Spiers
fdde129180
Obfuscate password entry
2014-12-28 23:01:26 +00:00
Ben Spiers
3d4636d8da
Config option for generator lighting
2014-12-27 21:37:20 +00:00
Ben Spiers
f419c4e6d5
Fix anvil and snow pickup
2014-12-27 21:26:20 +00:00
Ben Spiers
aea27f3bd6
Merge pull request #2029 from SoraZodia/master
...
@Interface removal for IPipeTile
2014-12-27 21:17:42 +00:00
Ben Spiers
f63807c75a
Fix some transmitter issues.
2014-12-27 21:09:34 +00:00
Ben Spiers
ccf7a37b22
Make HeatUtils not take unnecessary arguments.
2014-12-27 21:08:18 +00:00
Ben Spiers
d4f48401d3
Merge branch 'development' into v8
2014-12-22 23:46:17 +00:00
Ben Spiers
c77e84ca6c
Make cyan brighter
2014-12-22 23:41:33 +00:00
Ben Spiers
fe2c22862a
Fill in some machines' type arguments.
2014-12-22 23:40:51 +00:00
Ben Spiers
00fa5ccbe6
Make the heat methods not crash.
2014-12-22 23:40:29 +00:00
Ben Spiers
37e35d5943
Make loading the reactor from file update the "last" temperatures.
2014-12-22 23:40:03 +00:00
Ben Spiers
f3d9faff6b
Make it dangerous to be in the reactor while it is at >100million degrees, and full of burning plasma.
2014-12-22 23:38:32 +00:00
Ben Spiers
bc1ef33cd6
Make unforming the fusion reactor stop the burn.
2014-12-22 23:36:37 +00:00
Ben Spiers
7296c3dbcb
Reactors now a Heat source. Awaiting Balance.
2014-12-22 21:30:45 +00:00
Ben Spiers
3544addf20
Make heat generator not lose energy when below ambient temperature, and use the Carnot Engine equations for efficiency.
2014-12-22 20:10:01 +00:00
Ben Spiers
8a4aaff44a
Move standard simulation method into a Utils class.
2014-12-22 19:38:03 +00:00
Ben Spiers
ab2a7cb6c7
Improve temperature colours to allow for different base colours.
...
Make a start on insulation.
Code the characteristics of air into static IHeatTransfer variables.
2014-12-22 19:14:55 +00:00
Ben Spiers
7214a88a7a
Make network reader not use energy when in creative mode.
2014-12-20 02:09:55 +00:00
Ben Spiers
4a404dfc78
Improve Heat mechanic, and get it rendering nicely.
...
Colour temperature algorithm adapted from http://www.tannerhelland.com/4435/convert-temperature-rgb-algorithm-code/ - thanks to Tanner Hellan for the useful post.
2014-12-20 02:09:14 +00:00
Ben Spiers
2bd2e94c7b
Heat Generator changed to use the new heat mechanic. Not balanced or anything yet, more a proof of concept.
2014-12-19 04:49:15 +00:00
Ben Spiers
bb937fdd53
Heat Transmission.
2014-12-19 04:46:23 +00:00
Ben Spiers
b5f3d77b83
Making a start on Gas Centrifuge.
2014-12-19 02:23:42 +00:00
Ben Spiers
5dc0e5dca1
Merge branch 'development' into v8
2014-12-18 23:01:31 +00:00
Ben Spiers
6aa84d1388
Merge branch 'master' into development
...
Conflicts:
src/main/java/mekanism/common/tile/TileEntityPortableTank.java
2014-12-18 22:56:26 +00:00
Ben Spiers
1ce56d09e2
Fix Portable Tank NPE
2014-12-18 22:53:24 +00:00
Ben Spiers
fd0bdd4da8
Efficiency of isValidAcceptor methods.
2014-12-18 22:52:45 +00:00
Brian Lewis
b95836e6be
Merge remote-tracking branch 'upstream/master'
2014-12-18 08:50:53 -06:00
Ben Spiers
b5e289b504
Merge branch 'development' into v8
2014-12-16 20:35:55 +00:00
Ben Spiers
6e422151be
Merge branch 'master' into development
2014-12-16 20:34:55 +00:00
Ben Spiers
9a6b3c511e
Fix a silly mistake
2014-12-16 20:33:23 +00:00
Ben Spiers
d181dd9fd6
Oops.
2014-12-16 01:16:09 +00:00
Ben Spiers
40590f7a33
Merge branch 'development' into v8
...
Conflicts:
src/main/java/mekanism/common/tile/TileEntityElectricPump.java
2014-12-15 17:34:24 +00:00
Ben Spiers
add14395e4
Merge branch 'master' into development
2014-12-15 17:29:45 +00:00
Ben Spiers
e14501f3b5
Add RedstoneControl to Electric Pump.
2014-12-15 17:28:57 +00:00
Ben Spiers
e51307d68f
Fix merge
2014-12-15 17:20:13 +00:00
SoraZodia
14a7383e6a
@Interface removal for IPipeTile
...
It was causing an NoClassDefFoundError
In case you need proof, here's the crash log:
http://pastebin.com/9unZd9LG
2014-12-15 00:00:23 -10:00
Ben Spiers
9a47f800f9
Merge branch 'development' into v8
...
Conflicts:
src/main/java/mekanism/client/ClientProxy.java
2014-12-15 00:05:39 +00:00
Ben Spiers
7ebcba8528
Merge branch 'master' into development
2014-12-15 00:03:08 +00:00
Ben Spiers
ee585c05dc
Make glowing plastic blocks glow.
2014-12-15 00:02:22 +00:00
Ben Spiers
49be30de34
Merge branch 'development' into v8
...
Conflicts:
src/main/java/mekanism/common/tile/TileEntityAdvancedElectricMachine.java
src/main/java/mekanism/common/tile/TileEntityFactory.java
src/main/java/mekanism/common/util/MekanismUtils.java
2014-12-14 19:04:03 +00:00
Ben Spiers
a64cd69535
Merge branch 'master' into development
2014-12-14 18:17:36 +00:00
Ben Spiers
a91dcc49d4
Introduce statistical consumption of gases.
2014-12-14 18:10:46 +00:00
Ben Spiers
123ed6c6c5
Merge branch 'master' into development
2014-12-14 01:54:49 +00:00
Ben Spiers
e98026d78d
Fix paxels
2014-12-14 01:53:26 +00:00
Brian Lewis
681d7e9963
Removed commented out test line
2014-11-28 12:20:29 -06:00
Brian Lewis
15b6f7e70c
Fix for #1997 - gasGenerators now correctly limit output based on fuel type burned
2014-11-28 12:13:34 -06:00
Aidan C. Brady
a94b9a227d
Digital Miner delay is now persistent
2014-11-21 08:23:56 -05:00
Aidan C. Brady
db5c2c3d2c
Added IToolHammer support
2014-11-21 08:17:47 -05:00
Aidan C. Brady
ec5793dc4d
Fixed typo, fixed coloring of fluids in Dynamic Tank, Portable Tank & Mechanical Pipes
2014-11-21 08:13:38 -05:00
Ben Spiers
ce390ae426
Reorganise trait registration
2014-11-17 22:48:46 +00:00
Ben Spiers
0a0f67ee81
Get rid of IPipeTile since it wasn't working anyway. Fixes #1971 , #1975
2014-11-17 22:48:46 +00:00
Ben Spiers
791ed60bb0
Merge branch 'development' into 1.8
...
Conflicts:
src/main/java/mekanism/common/multipart/MultipartMekanism.java
src/main/java/mekanism/common/multipart/PartLogisticalTransporter.java
2014-11-17 22:47:08 +00:00
Ben Spiers
5749ed4d2a
Merge branch 'master' into development
2014-11-17 22:41:15 +00:00
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
Byron Shelden
020d347ee3
Added additional power generation configuration ( #1164 )
...
* Can now configure heat generator power from adjacent lava
* Can now configure heat generator power from the nether
* Wind power is now configured by specifying minimal and maximal Y levels and generation values.
* Defaults to 60J/t at Y 24 and 480J/t at Y 255
2014-08-02 12:56:41 -07:00
Aidan Brady
8e10c4fbf7
Fixed panel harvest levels
2014-08-02 14:00:19 -04:00
Aidan Brady
33970b6bf7
Updated Multiblock Controller textures, added multi-meta capability to Connected Texture Renderer
2014-08-02 11:16:14 -04:00
Aidan Brady
19cfb7b8d6
Generalized the actual manager, and the data manager (by means of reflection)
2014-08-02 00:10:29 -04:00
Aidan Brady
c97f617692
Generalized some of the multiblock code into a stricter format
2014-08-01 23:44:28 -04:00
Aidan Brady
8f6cf7e1c9
Merge branch '1.8' of https://github.com/aidancbrady/Mekanism into 1.8
2014-08-01 22:28:18 -04:00
Aidan Brady
d1bef0b7e3
Fixes! The new system just about works, I just need to work on Dynamic Tank inventory merging.
2014-08-01 22:28:13 -04:00
Ben Spiers
e0e54523fb
Remove some bad imports
2014-08-02 00:49:46 +01:00
Ben Spiers
34b4742798
Start on framework for energy/fluid/gas/item teleportation
2014-08-02 00:49:00 +01:00
Aidan Brady
548c5b0835
More work, currently broken
2014-08-01 15:49:03 -04:00
Aidan Brady
fc7dd3e65a
Started on a new, more modular approach to controller-less multiblocks, allowing for the creation of the EIM
2014-08-01 13:04:31 -04:00
Aidan Brady
1cfe6fc352
Started work on implementation of Dynamic Tank cache merging, fixed Salination Tank not rendering at height 3, made sure all multiblocks load after partial chunk load
2014-08-01 01:33:54 -04:00
Aidan Brady
4090fcf490
Reactor now auto-forms
2014-08-01 00:55:24 -04:00
Aidan Brady
22db67c895
Spacing cleanup
2014-07-31 22:27:46 -04:00
Aidan Brady
dde9b53447
Fixed the addition of the "creative control circuit"
2014-07-31 21:08:46 -04:00
Aidan Brady
d9bb5845cd
Naming standards :)
2014-07-31 20:55:01 -04:00
Ben Spiers
725b7463f0
Make the mod classes significantly less godlike.
...
Move Config variables into their own class, (in api because other stuff in API references config, may make sense to move it back to common later), and move Blocks and Items into final variables in their own classes. It looks a lot cleaner this way and my OCD can finally rest now.
2014-08-01 01:35:06 +01:00
Aidan Brady
6762f416d3
Glowing lasers and laser amplifier model!
2014-07-31 19:46:31 -04:00
Aidan Brady
6e975ee632
Made them really infinite
2014-07-31 19:29:49 -04:00
Aidan Brady
da35b509fd
Creative Energy Cube now won't be drained of or receive power.
2014-07-31 19:19:03 -04:00
Aidan Brady
ed4aa7671c
Merge branch 'development' into 1.8
...
Conflicts:
src/main/java/mekanism/common/EnergyNetwork.java
2014-07-31 19:00:54 -04:00
Aidan Brady
7e378dd796
Fixed Atomic Disassembler issue
2014-07-31 18:57:18 -04:00
Aidan Brady
b2e676aabb
Fixed an API issue, fixed Robit nametag not updating, fixed Sorter Mod ID filter bugginess
2014-07-31 18:41:27 -04:00
Aidan Brady
269343f9f0
Revert back to the old method of power distribution to fix BuildCraft issues. We shouldn't try to make up for other mods' bugs.
2014-07-31 18:17:03 -04:00
Aidan Brady
285423d4b1
Merge branch 'development' into 1.8
2014-07-31 18:08:12 -04:00
Aidan Brady
4a70449899
Merge branch 'master' into development
2014-07-31 18:07:58 -04:00
Aidan
56e6cbcb55
Merge pull request #1590 from Tonius/patch-1
...
Various fixes to jetpack-related rendering
2014-07-31 18:04:28 -04:00
Ben Spiers
a6ff4750e4
Fusion reactor NBT save/load, and a first attempt at plasma render. Fusion reactor is basically finished at this point.
2014-07-31 22:57:30 +01:00
Ben Spiers
d7c060d6fb
Update BC API and fix up EnergyNet and CableUtils to work with the new MjAPI
2014-07-31 18:41:32 +01:00
Ben Spiers
d8321196d9
Oops
2014-07-31 16:02:55 +01:00
Ben Spiers
4faa733106
Merge branch 'development' into 1.8
2014-07-31 15:59:30 +01:00
Ben Spiers
59dab7c848
Move StackUtil to api package for not causing errors.
2014-07-31 15:58:02 +01:00
Ben Spiers
1b54cfbb50
More laser amplifier changes
2014-07-31 15:56:07 +01:00
Ben Spiers
d4f05c8b99
Some cleanup of MekanismUtils and more EnergyDisplay changes to use our energy units.
...
Because who the hell ever uses siemens, anyway?
2014-07-31 15:55:03 +01:00
Ben Spiers
26bc15ac3b
Adding Lit Redstone Ore to OreDict is well and truly broken.
2014-07-31 15:53:24 +01:00
Ben Spiers
b62c5c8a3a
Get basic functionality working for the Laser Amplifier. No mode changing yet, and using the laser model in lieu of the actual one.
2014-07-30 22:26:03 +01:00
Ben Spiers
bfe3b545d2
Merge branch 'development' into 1.8
2014-07-30 15:15:42 +01:00
Ben Spiers
78addc3303
Stop a potential NPE in Gas Gauges.
2014-07-30 15:14:54 +01:00
Ben Spiers
2b7300bfa3
Stop a potential NPE in Gas Gauges.
2014-07-30 15:09:27 +01:00
Ben Spiers
6f4e0da3c5
Fix a small advanced solar placement bug.
2014-07-28 23:11:08 +01:00
Ben Spiers
9413950842
Merge branch 'development' into 1.8
2014-07-28 17:33:38 +01:00
Ben Spiers
c339ee7a18
Merge branch 'master' into development
2014-07-28 17:33:09 +01:00
Ben Spiers
c97464649d
Fix trying to use IC2 EnergyNet without IC2 installed. It would never work anyway.
2014-07-28 17:20:31 +01:00
Ben Spiers
1d52a4f5a0
Add a Creative Energy Cube that's always half-full so it can sink or provide arbitrary amounts of energy.
2014-07-28 17:18:33 +01:00
Ben Spiers
38b554266e
Add tabs to Fuel and Heat GUIs to get to the other one.
2014-07-28 17:17:42 +01:00
Ben Spiers
cf4df0941b
Fix a crash casting null to float
2014-07-28 15:05:53 +01:00
Ben Spiers
5dcd9abd0f
Add an injection rate text field
2014-07-28 15:04:55 +01:00
Aidan Brady
9696ad246c
Merge branch '1.8' of https://github.com/aidancbrady/Mekanism into 1.8
2014-07-28 09:27:16 -04:00
Aidan Brady
1ad7fe81b9
Salination Plant now auto-forms
2014-07-28 09:27:08 -04:00
Tonius
fef1fb6fb6
Committed the other files I meant to commit.
2014-07-28 15:01:58 +02:00
Tonius
d6cf9a8e90
Various fixes to rendering
...
Fixed:
- Jetpack particles being too dark
- Jetpack particles flickering towards the world origin
- Jetpack HUD showing in almost every screen
- RenderTickHandler still ticking when the game is paused
2014-07-28 15:01:27 +02:00
Ben Spiers
e2913e2520
Work on reactor GUI.
...
Three different screens now because there's so much information. Still need an option on the fuel screen to set the injection rate and a proper button to form the multiblock.
2014-07-28 04:24:56 +01:00
Ben Spiers
e004fdca98
Merge branch 'development' into 1.8
...
Conflicts:
src/main/java/mekanism/generators/common/tile/TileEntityHeatGenerator.java
2014-07-27 20:53:00 +01:00
Ben Spiers
d0d660b9d4
Merge branch 'master' into development
2014-07-27 20:45:53 +01:00
Ben Spiers
1d61c3d4e8
Tweak energynet logic a bit to safeguard against overly high tiers of IC2 acceptor and things that implement everything but with only one working.
...
Should fix AE2 EU P2P tunnel support.
2014-07-27 20:45:13 +01:00
Aidan C. Brady
31e24ecd1e
Fixed default enchantibilities
2014-07-26 19:17:02 -04:00
Aidan C. Brady
3abd80f1a2
Generators now sustain fluid and gas data
2014-07-26 19:10:17 -04:00
Aidan C. Brady
ce5bddbdd1
Merge branch 'development' into 1.8
...
Conflicts:
src/main/java/mekanism/common/block/BlockMachine.java
src/main/java/mekanism/common/item/ItemBlockMachine.java
src/main/java/mekanism/common/tile/TileEntityDigitalMiner.java
src/main/java/mekanism/common/tile/TileEntityPRC.java
2014-07-26 18:57:18 -04:00
Aidan C. Brady
ab34edc46a
Finished off new system of sustained data
2014-07-26 18:44:24 -04:00
Aidan C. Brady
94c3a6aa60
Started work on a new system of managing sustained data
2014-07-26 18:16:00 -04:00
Aidan C. Brady
7ac7fbc5cc
Sustained gas and fluid support for Chemical Washer, Chemical Crystallizer and Chemical Infuser
2014-07-26 17:59:43 -04:00
Aidan C. Brady
2876eb535d
Merge branch 'master' into development
2014-07-26 17:39:03 -04:00
Aidan C. Brady
ba289ced25
Added sustained fluid and gas tanks to PRC and Electrolytic Separator, fixed Gas Generator losing energy when being picked up
2014-07-26 17:37:25 -04:00
Aidan C. Brady
aaffc3e364
Updated some imports and added textures
2014-07-26 16:45:48 -04:00
jmongeon
1689031219
Fix Gas Generator not accepting Buildcraft fuels.
2014-07-24 23:07:11 -04:00
Aidan C. Brady
22b3097d15
Laser model! Also added some new Reactor Block assets.
2014-07-24 23:02:30 -04:00
Aidan C. Brady
5bee3991d8
Merge branch 'development' into 1.8
...
Conflicts:
src/main/java/mekanism/common/tile/TileEntityEnergyCube.java
2014-07-23 13:50:43 -04:00
Aidan C. Brady
bb8985b6f8
Fixed a few energy transfer issues
2014-07-23 13:49:42 -04:00
Aidan C. Brady
2b5bb53bc6
Fixed a few recipe issues
2014-07-23 13:43:12 -04:00
Aidan C. Brady
d8e94b00d2
Added effect information to upgrade GUI
2014-07-23 11:06:58 -04:00
Aidan C. Brady
52efdac614
Eliminated the deprecated "getSpeedMultiplier()" and "getEnergyMultiplier()" methods
2014-07-23 10:17:03 -04:00
Aidan C. Brady
523ec21467
Added button to remove upgrade, fixed font size. Almost done!
2014-07-22 22:16:20 -04:00
Aidan C. Brady
790cd33f2d
Merge branch '1.8' of https://github.com/aidancbrady/Mekanism into 1.8
2014-07-22 20:37:59 -04:00
Aidan C. Brady
6470f69569
A big load of work on the new upgrade GUI
2014-07-22 20:37:53 -04:00
Ben Spiers
84daf186ca
More Reactor GUI work
2014-07-23 01:25:10 +01:00
Ben Spiers
775ba68482
Tweaking of lasers for packet-efficiency
2014-07-22 22:34:19 +01:00
Ben Spiers
c66676dd55
Fix some Server-side packets being sent by the client
2014-07-22 21:13:01 +01:00
Ben Spiers
327389a88c
Get Lasers kind of working vs. dediservers
2014-07-22 21:11:43 +01:00
Ben Spiers
dd421f7308
This should stop the servercrashing issue
2014-07-22 18:03:34 +01:00
Ben Spiers
a2bb224bf5
Fix transmitter render pass to stop things occluding incorrectly, make lasers get stronger and weaker as they start and stop
2014-07-22 17:41:34 +01:00
Ben Spiers
e35a673c8b
Get lasers rendering. I've yet to proxy it off, so THIS WILL CRASH DEDICATED SERVERS
2014-07-22 03:41:30 +01:00
Aidan C. Brady
99482d8fd0
Fixed a minor issue
2014-07-21 22:24:27 -04:00
Aidan C. Brady
25cf5236ea
A few fixes
2014-07-21 21:33:43 -04:00
Aidan C. Brady
076c5f7377
More work!
2014-07-21 21:21:53 -04:00
Aidan C. Brady
2523d2fd6b
Did some work on actual upgrade system
2014-07-21 20:46:35 -04:00
Aidan C. Brady
435596831e
Merge branch 'development' into 1.8
2014-07-21 19:45:50 -04:00
Aidan C. Brady
cdb1ad2ffe
Attempted a fix for a strange connection error
2014-07-21 19:45:14 -04:00
Aidan C. Brady
0b8ec37164
More work on upgrade GUI, also made SimpleGui packets send new window ID to client
2014-07-21 19:15:27 -04:00
Aidan C. Brady
e778449045
More work! Finished off the upgrade tab and removed upgrade slot from all upgrade-wielding containers.
2014-07-21 18:07:15 -04:00
Aidan C. Brady
48183f6670
Work on the new upgrade system, specifically with GUI changes
2014-07-21 17:47:29 -04:00
Aidan C. Brady
f2441a1ebd
Merge branch 'development' into 1.8
...
Conflicts:
src/main/java/mekanism/common/recipe/BinRecipe.java
src/main/java/mekanism/common/tile/TileEntityChemicalInfuser.java
2014-07-21 17:02:06 -04:00
Ben Spiers
5f26402bd9
Minor cleanup and tabs
2014-07-21 21:48:28 +01:00
Aidan C. Brady
0864e1061a
Merge a few more fixes
2014-07-21 16:45:08 -04:00
Aidan C. Brady
27056da3e4
Merge back a few bug fixes
2014-07-21 16:41:27 -04:00
Aidan C. Brady
4fcd3b47c5
Fix a few little bugs
2014-07-21 16:34:31 -04:00
jstockwin
0a9dbec78c
Stop energy cube core rendering when cube is empty.
...
This will stop it from blocking out other rendering when it's not opaque
enough to be visible
2014-07-21 21:14:12 +01:00
Aidan C. Brady
d16483f4b1
Started work on the new upgrade system, as well as the new GUI
2014-07-21 14:57:31 -04:00
Aidan C. Brady
0416e2e904
Finished Digital Miner visual render functionality, also fixed a few issues with gas tanks
2014-07-21 13:30:39 -04:00
Aidan C. Brady
69a411813e
Started work on a Digital Miner visual render thing. For some reason it's culling all oceans.
2014-07-21 01:10:53 -04:00
Aidan C. Brady
7e525e10c6
Fixed a few recipes, also started work on Digital Miner visual
2014-07-20 23:29:35 -04:00
Aidan C. Brady
c1b317dcde
Added in warning for missing stacks. Onto visual Digital Miner range rendering!
2014-07-20 21:20:45 -04:00
Aidan C. Brady
2b817e28cd
Fixed an issue with Bins, also fixed a small GUI issue with the new filter system
2014-07-20 20:30:35 -04:00
Aidan C. Brady
de86e0b2a2
Finished off the filtering system! Also added new "fuzzy mode" to ItemStack filters in order to ignore metadata checks.
2014-07-20 20:19:01 -04:00
Aidan C. Brady
4adb6de83d
Fix a few bugs
2014-07-20 16:16:09 -04:00
Aidan C. Brady
fe177d20c7
Filter-based replacing works! Now to get the require system to work and the warning system set up.
2014-07-20 16:06:47 -04:00
Aidan C. Brady
ad505cf882
More work! Networking is just about complete, and all filter creation and edit GUIs now have replace stack slots and replace required buttons.
2014-07-20 15:45:44 -04:00
Aidan C. Brady
ddc499c9fe
More work on Digital Miner filter system, also fixed a little memory leak
2014-07-20 15:27:35 -04:00
Aidan C. Brady
13afad3b0d
Started work on new Digital Miner filter system
2014-07-19 19:55:34 -04:00
Aidan C. Brady
a48a0101e9
Flamethrowers are just about polished! Just need to do a few more entity damage refinements.
2014-07-19 14:41:27 -04:00
Aidan C. Brady
00abd47b84
Merge branch '1.8' of https://github.com/aidancbrady/Mekanism into 1.8
2014-07-19 02:34:13 -04:00
Aidan C. Brady
87f92326f9
Work on flame vector calculation - still need to get it to catch blocks and entities on fire properly
2014-07-19 02:34:07 -04:00
Ben Spiers
7b8b75759c
More GUI Work. Nowhere near finished yet, there's a lot of information to squeeze in.
2014-07-19 04:03:32 +01:00
Ben Spiers
2e7d3a1945
Work on making it work Client-side.
2014-07-19 03:23:11 +01:00
Ben Spiers
16e38fafbe
Fix things, adjust the algorithm slightly to model the differential equation better.
2014-07-18 23:29:45 +01:00
Aidan C. Brady
497997d0e4
Merge branch '1.8' of https://github.com/aidancbrady/Mekanism into 1.8
2014-07-18 01:35:03 -04:00
Aidan C. Brady
cfc308b042
Flames now render how I want them to! Tomorrow I add logic, such as the burning of entities and the smelting of blocks.
2014-07-18 01:34:56 -04:00
Ben Spiers
be15bab0b7
More Reactor work. Making way for persistent reactor state and guis and stuff.
2014-07-18 02:29:19 +01:00
Aidan C. Brady
9469fcb51a
Started work on actual flame implementation
2014-07-17 20:06:51 -04:00
Aidan C. Brady
2f4d545fb5
Major Flamethrower work - finished networking and implemented active state management. Active sound effects work, too.
2014-07-17 17:18:53 -04:00
Aidan C. Brady
c9f569fd4a
Merge branch 'development' into 1.8
2014-07-17 01:44:54 -04:00
Aidan C. Brady
0a1afbae93
Fixed a major issue that was causing transmitter networks to be ticked twice in a single tick
2014-07-17 01:44:32 -04:00
Aidan C. Brady
186e6f5f05
Fix a silly bug with tile sounds I just created
2014-07-17 01:28:20 -04:00
Aidan C. Brady
7ddb8e9727
Merge branch 'development' into 1.8
...
Conflicts:
src/main/java/mekanism/client/ClientTickHandler.java
src/main/java/mekanism/common/CommonProxy.java
src/main/java/mekanism/common/Mekanism.java
2014-07-16 23:59:07 -04:00
Aidan C. Brady
cfeb08a8ee
Fixed Gas Mask OP-ness, added config option to let creative mode override the Electric Chest, fixed Gas Generator crash
2014-07-16 23:53:00 -04:00
Aidan C. Brady
8ccf4e6653
Fixes!
2014-07-16 19:16:38 -04:00
Aidan C. Brady
4309a7d7b1
More work - SoundHandler now uses a channel-based system for sounds.
2014-07-16 17:07:54 -04:00
Aidan C. Brady
be7ea115b6
Some work on flamethrower sounds, also refactored sound system to allow for multiple sounds from a single object reference (to allow flamethrower and jetpack sounds to work simultaneously)
2014-07-16 16:59:45 -04:00
Aidan C. Brady
6e5eca9d4e
Merge branch '1.8' of https://github.com/aidancbrady/Mekanism into 1.8
2014-07-15 22:59:20 -04:00
Aidan C. Brady
ee789547c6
A bit of work on flamethrower sound effect handling
2014-07-15 22:59:14 -04:00
Ben Spiers
8673440172
Reactor Logic work. More complex now, and more realistic, taking some cues from BigReactors' example.
...
Plasma conducts temperature to the casing, which then conducts to coolant or the environment. Energy from passive cooling is stored in an internal buffer.
2014-07-16 02:54:13 +01:00
Ben Spiers
62659afadb
Reactor Multiblock work
2014-07-16 02:54:13 +01:00
Ben Spiers
445cb7a0a4
You are not using Wolfram|Alpha now, @unpairedbracket.
2014-07-16 02:54:13 +01:00
Ben Spiers
bdde617489
More work on Fusion Reactor
2014-07-16 02:54:13 +01:00
Ben Spiers
cb2188580e
More Laser and Reactor work. Lasers work now, and Heat Generators generate energy from incident lasers, in order to test lasers. This is probably only temporary.
2014-07-16 02:54:13 +01:00
Aidan C. Brady
cdeb25803c
Started work on flamethrower sounds, also increased efficiency of SoundHandler (now loops over sounds only once instead of twice)
2014-07-15 01:09:38 -04:00
Aidan C. Brady
f9fdb56e24
Fixed a few tiny laser compile issues
2014-07-14 17:23:42 -04:00
Aidan C. Brady
a98bf8bba3
Merge branch 'development' into 1.8
2014-07-14 17:15:26 -04:00
Aidan C. Brady
de1e264c68
Merge branch 'master' into development
2014-07-14 17:15:11 -04:00
Aidan C. Brady
146d974479
Fixed Teleporter localization, fixed balloons placing on non-solid sides, added AE processing recipes, improve tele porter efficiency
2014-07-14 17:14:32 -04:00
Ben Spiers
c009940140
Fix Railcraft Dependency
...
This is such a pain.
2014-07-14 20:47:45 +01:00
Aidan C. Brady
a24bd2e7ad
A bit of work on teleporter localization. There's something weird going on, though.
2014-07-14 12:57:57 -04:00
Ben Spiers
8d36e9a152
Fix a bizarre bug I introduced ages ago.
2014-07-14 16:23:03 +01:00
Aidan C. Brady
23b6ce5105
Merge branch 'development' into 1.8
2014-07-13 23:52:29 -04:00
Aidan C. Brady
1094475344
Fixed teleporter crash, fixed asset issue
2014-07-13 23:52:17 -04:00
Aidan C. Brady
ad0a71ee71
Merge branch 'development' into 1.8
2014-07-13 23:34:28 -04:00
Aidan C. Brady
17f8fa11da
Implemented robit crash fix
2014-07-13 23:34:01 -04:00
Aidan C. Brady
ddb6140513
Merge branch '1.8' of https://github.com/aidancbrady/Mekanism into 1.8
2014-07-13 23:27:28 -04:00
Aidan C. Brady
9592d7f024
Flamethrower fixes!
2014-07-13 23:27:23 -04:00
Ben Spiers
11e21e1957
Start on implementation of lasers.
2014-07-14 01:34:26 +01:00
Ben Spiers
700cc76c35
Fix a different, unrelated OreDict issue.
2014-07-13 19:58:00 +01:00
Ben Spiers
39c6b45a2c
Fix Iron Dust smelting issue. Close #1478
2014-07-13 19:58:00 +01:00
Ben Spiers
c560bdc2e1
Fix a different, unrelated OreDict issue.
2014-07-13 19:53:41 +01:00
Ben Spiers
3e3bf2c25c
Fix Iron Dust smelting issue. Close #1478
2014-07-13 19:53:41 +01:00
Aidan C. Brady
1a458834a8
Work on making flamethrowers work nice. Still need to get first person neutral particles down.
2014-07-13 13:32:28 -04:00
Aidan C. Brady
6fbfd22583
Merge branch 'development' into 1.8
2014-07-13 00:16:05 -04:00
Ben Spiers
4bea4c62fd
Remove stray @Method
...
Should fix #1500
2014-07-13 05:06:57 +01:00
Aidan C. Brady
3f7de46991
Just about polished off baby skeletons, started on getting the Flamethrower to render with correct scale and orientation
2014-07-12 23:59:39 -04:00
Aidan C. Brady
6cc7efc64b
Merge branch 'master' into 1.8
2014-07-12 22:53:21 -04:00
Aidan C. Brady
c223eabb95
Fixed Combiner NEI texture, fixed Cardboard Box not working
2014-07-12 22:52:13 -04:00
Aidan C. Brady
6271284436
Merge branch '1.8' of https://github.com/aidancbrady/Mekanism into 1.8
2014-07-12 22:35:04 -04:00
Aidan C. Brady
9abc111ecd
Baby Skeletons, started work on Flamethrower
2014-07-12 22:34:58 -04:00
Ben Spiers
0638cdb61c
More work on Fusion Reactor and Lasers
2014-07-13 02:46:47 +01:00
Aidan C. Brady
cf6f5ab387
Bump versions to 8.0.0
2014-07-12 18:52:46 -04:00
Aidan C. Brady
246c9426be
Merge branch 'development' into 1.8
2014-07-12 18:50:05 -04:00
Ben Spiers
0758ad752b
Fix un-checked MFR API usage
2014-07-12 21:04:33 +01:00
Aidan C. Brady
79f27e9d11
Merge branch 'master' of https://github.com/aidancbrady/Mekanism
2014-07-12 16:02:32 -04:00
Aidan C. Brady
369eb012af
Fixed Portable Tank transfer issue, fixed inventories not being sustained, fixed Logistical Transporter crash
2014-07-12 16:02:21 -04:00
Ben Spiers
a8bfe29c8e
Depend on EnderIO and ExtraUtilities
...
If this doesn't fix it I don't know what will
2014-07-12 19:03:17 +01:00
Ben Spiers
f095cbd3fd
Fix the BuildCraft API dependency
...
Hopefully fix some issues.
2014-07-12 18:46:43 +01:00
Aidan C. Brady
390f0b06bc
Force Mekanism to load after FMP
2014-07-12 12:59:44 -04:00
Aidan C. Brady
5bc7288bc2
Mekanism v7...official release.
2014-07-12 00:05:19 -04:00
Ben Spiers
e3f8508527
Merge branch 'development' into 1.8
2014-07-12 01:56:13 +01:00
Ben Spiers
4500232762
More constants!
...
Refine constants based on findings of experimentation with the Sage simulator I wrote (here: https://gist.github.com/unpairedbracket/43ee788498dd5dcd1011 )
2014-07-12 01:54:53 +01:00
Aidan C. Brady
6095f6e062
Fixed the evil mac sound bug by increasing the sampling rate and doubling the buffer size to two bytes. Also removed printlns.
2014-07-11 16:07:58 -04:00
Aidan C. Brady
177372e9fe
Rewrote idle path calculations of Logistical Transporters!
...
Firstly, stacks will no longer will remember their home locations after a single failed home routing calculation. More importantly, instead of recursively pathfinding the furthest transporter from a stack's current location, the stack will randomly select a direction to start traveling. Once it reaches the end of a line of transporters, it will attempt to recalculate a path to an inventory. If it is unsuccessful, it will simply pick another direction to start traveling and the process will repeat. This keeps the previous behavior, but does it much less CPU-intensively.
2014-07-11 14:52:55 -04:00
Aidan C. Brady
4ba9afb369
Updated recipes to be more consistent. This was about all I wanted to accomplish for v7...either I make Gas Cells tomorrow or I push the release.
2014-07-11 01:45:44 -04:00
Aidan C. Brady
ee00c5a22b
Chemical Dissolution Chamber now can accept upgrades
2014-07-11 00:42:06 -04:00
Aidan C. Brady
60b226600f
Fixes galore!
2014-07-11 00:34:05 -04:00
Aidan C. Brady
eda233f1cf
More GUI bugs!
2014-07-10 23:12:19 -04:00
Aidan C. Brady
77d3469f61
Fix a few GUI bugs
2014-07-10 23:06:35 -04:00
Aidan C. Brady
171c9767e0
Chemical Crystallizer now accepts upgrades
2014-07-10 22:40:20 -04:00
Aidan C. Brady
65a8633441
Gave Chemical Oxidizer and PRC upgrade systems, fixed Chemical Oxidizer and Electrolytic Separator NEI modules
2014-07-10 22:28:04 -04:00
Aidan C. Brady
7198704363
Fixed a crash!
2014-07-10 18:13:56 -04:00
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
a643f1c35c
Start on Fusion Reactor logic and infrastructure. Currently experimenting with parameters for balance.
2014-07-10 19:24:33 +01: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
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