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

752 commits

Author SHA1 Message Date
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