Commit Graph
213 Commits
Author SHA1 Message Date
Ben Spiers 7b4fefeb60 Fix some of the things that were broken, add more type-specs. 2016-02-08 22:46:06 +00:00
Ben Spiers ac39b6fabe Merge branch 'v9' into 1.8.9 2016-02-08 14:55:27 +00:00
aidancbrady 203890ca88 Redesigned Solar Evaporation Controller to dynamically update heat instead of the simple linear algorithm used before
- Plant height determines overall rate of temperature change, rate of processing
- Biomes determine base temperature of plants, meaning a desert could process small amounts of brine on its own
- Rate of heat decay exponentially increases as heat increases, meaning large amounts of heat are needed to greatly increase temperature
- System of heat management designed for integration with heat API in near future
2016-02-02 21:39:37 -05:00
Ben Spiers 0179ea1f38 Mostly rendering improvements 2016-02-01 23:42:30 +00:00
Ben Spiers 25d0b7441b Merge branch 'v9' into 1.8.9
Forgot to complete the merge so some weird stuff might have ended up in the patch. Oops.
2016-02-01 23:40:35 +00:00
Ben Spiers c5987588b8 Make Coord4D work as a BlockPos better. 2016-01-30 21:50:22 +00:00
aidancbrady 7c52d03cb5 Remove some legacy config handling, make all turbine values configurable 2016-01-30 08:46:36 -07:00
Ben Spiers 62e7cc8f65 Merge branch 'v9' into 1.8.9 2016-01-30 00:47:54 +00:00
aidancbrady 88cfee2ab2 Changed Metallurgic Infuser infuse system to use icons for textures 2016-01-29 17:47:41 -07:00
aidancbrady 06dc2227f2 A few ejector fixes 2016-01-28 23:45:22 -07:00
aidancbrady 0a135a6936 Loads of changes to Electric Pump, Fluidic Plenisher and Transmitters
- Electric Pumps are now more efficient, upgradable, and have new config options, one of which prevents sucking of water sources (true by default)
- Fluidic Plenishers are now upgradable
- Transmitters can be upgraded by being right-clicked by alloys normally involved in crafting-based upgrading
2016-01-28 20:38:32 -05:00
Ben Spiers 8af7ec270a Fix item package 2016-01-25 00:54:05 +00:00
Ben Spiers 591fc1e4b4 Fix up most of the common package, blocks and tiles excluded. 2016-01-23 19:11:16 +00:00
Ben Spiers a80f724cc2 Apply various common one-to-one replacements
More work on common too. network package now done.
2016-01-23 13:24:51 +00:00
Ben Spiers 4384dbe376 More API stuff, make Pos3D actually override the Vec3 methods 2016-01-22 00:20:01 +00:00
Ben Spiers fce1acae09 Fix up some api stuff that broke 2016-01-19 19:58:54 +00:00
Ben Spiers 4247ba136a Fix compile errors in API package 2016-01-16 14:35:01 +00:00
Ben Spiers 9b8d9d92d6 Start update to 1.8.9
Fix all references to cpw.mods.fml namespace
2016-01-14 19:22:48 +00:00
aidancbrady 9b3969f1ff Shapeless Mekanism Recipes, IMC crafting recipe integration, fixed removal of machine recipes 2016-01-12 18:41:15 -05:00
aidancbrady 08eb8be841 A few necessary library additions 2016-01-04 00:33:00 -05:00
aidancbrady 2b785c95f3 Transmitters now intelligently maintain buffers when transmitter nodes are destroyed 2015-11-26 15:41:22 -07:00
aidancbrady b248cf4b07 Fixed fluid/gas duplication 2015-11-26 14:40:46 -07:00
Ben Spiers c9f51bd970 Update some MekanismUtils functions to use Coord4D 2015-07-28 04:58:04 +01:00
Ben Spiers 53d8522d42 Make a change to prevent networks leaking on chunk unload.
It seems to have fixed the broken pipe issue as well, please test.
2015-07-21 20:45:06 +01:00
Ben Spiers 74939083c8 Fix frame mods moving Teleporters with fake worlds
If there is no ChunkProvider, the block can't be unloaded.
2015-07-19 13:40:03 +01:00
Ben Spiers 3d34b8c83f Make it actually possible to watch transmitter log
Don't know how/when that broke.
2015-07-18 21:50:42 +01:00
Aidan 2eeee08cf2 Merge pull request #2793 from tterrag1098/master
Maintain java 6 source compatability in API classes
2015-07-01 23:09:14 -07:00
aidancbrady e86df43477 Configurable gas storage capacities for flamethrower, jetpack & scuba tank 2015-06-30 15:01:14 -07:00
tterrag1098 d85dfd4f31 Maintain java 6 source compatability in API classes 2015-06-30 00:48:05 -04:00
aidancbrady 81511d3800 Doubled base Solar Evaporation Plant processing rate and added config property, double check transporter paths to prevent bad calculations 2015-06-16 20:42:46 -04:00
aidancbrady 42ce42aee2 Moved debug reference to MekanismAPI, fixed RC recipe 2015-06-15 12:39:48 -04:00
aidancbrady a382280be5 Don't spam console with transmitter logs unless debug is on 2015-06-13 14:55:36 -04:00
aidancbrady 55407e43a9 Added a config entry allowing operators to bypass restrictions 2015-06-05 09:47:59 -04:00
aidancbrady fa71836e0d Fixed bad cast, fixed tubes and pipes losing capacity after world load 2015-05-22 13:06:46 -04:00
aidancbrady 6a25667b20 Added property to prevent world damage by flamethrowers & lasers 2015-05-10 19:33:28 -04:00
aidancbrady c62e27d5fd Configurable armored jetpack resistance values, quadrupled brine production rate of SE plants 2015-05-06 08:34:04 -04:00
Aidan C. Brady 308233720c Temporary fix for multiple buffer type merges 2015-04-15 12:52:07 -04:00
Aidan C. Brady c61e4c116b Cleanup 2015-04-12 17:19:32 -04:00
Ben Spiers c23aafee9f Should fix the NPE in updateTransmitterOnSide. 2015-04-12 00:19:49 +01:00
Ben Spiers 5b558065fc Might fix the NPE in FluidNetwork that @NitroxydeX was experiencing 2015-04-10 18:54:38 +01:00
Ben Spiers 468abefe17 Fix NPE on creating networks. 2015-04-10 18:39:27 +01:00
Ben Spiers 4a2dde8f87 Fix API, put back some methods that GC uses, optimise imports in API. 2015-04-06 18:53:16 +01:00
Aidan C. Brady 034d732e15 A bit more tidying 2015-04-06 11:10:57 -04:00
Aidan C. Brady ec7b0555c9 Cleanup 2015-04-06 11:08:57 -04:00
Ben Spiers c13b3b240f Fix some bugs with LogiTransporters 2015-04-06 02:18:45 +01:00
Ben Spiers 16ce88f09a Restore some client-side network stuff. More fixes 2015-04-06 01:29:07 +01:00
Ben Spiers d29d1580bb Fix some stuff I missed in the merge, and server-client communication. 2015-04-04 02:44:14 +01:00
Ben Spiers 7a2461540f Merge branch 'development' into networkRefactor.
Hopefully I didn't miss anything

Conflicts:
	src/main/java/mekanism/api/gas/GasNetwork.java
	src/main/java/mekanism/client/render/RenderPartTransmitter.java
	src/main/java/mekanism/common/EnergyNetwork.java
	src/main/java/mekanism/common/FluidNetwork.java
	src/main/java/mekanism/common/InventoryNetwork.java
	src/main/java/mekanism/common/content/transporter/TransporterStack.java
	src/main/java/mekanism/common/multipart/PartHeatTransmitter.java
	src/main/java/mekanism/common/multipart/PartLogisticalTransporter.java
	src/main/java/mekanism/common/multipart/PartMechanicalPipe.java
	src/main/java/mekanism/common/multipart/PartPressurizedTube.java
	src/main/java/mekanism/common/multipart/PartSidedPipe.java
	src/main/java/mekanism/common/multipart/PartUniversalCable.java
	src/main/java/mekanism/common/util/MekanismUtils.java
	src/main/java/mekanism/common/util/PipeUtils.java
2015-04-03 19:45:25 +01:00
Ben Spiers 29659ad2cd Fix some client/server stuff, and fluid networks 2015-04-03 18:04:56 +01:00
Ben Spiers d14686ea2e Work on clientsiding, acceptors and things like redstone and multipart blocking. 2015-04-02 03:22:53 +01:00