upstream/Mekanism-Community-Edition
1
0 Fork 0
mirror of https://github.com/Thorfusion/Mekanism-Community-Edition.git synced 2026-11-13 16:54:16 +00:00
Code Issues Packages Projects Releases Wiki Activity
3,316 Commits 9 Branches 76 Tags
84da514b54cf4926dbdba225f45c0f3e3a1e7586
Commit Graph
34 Commits
Author SHA1 Message Date
aidancbrady 84da514b54 Rename Solar Evaporation Plant to Thermal Evaporation Plant 2016-02-18 18:37:38 -05: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
aidancbrady 7c52d03cb5 Remove some legacy config handling, make all turbine values configurable 2016-01-30 08:46:36 -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
aidancbrady e86df43477 Configurable gas storage capacities for flamethrower, jetpack & scuba tank 2015-06-30 15:01:14 -07: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 55407e43a9 Added a config entry allowing operators to bypass restrictions 2015-06-05 09:47:59 -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
Ben Spiers c0281d4470 Fix #2298 2015-03-22 02:23:45 +00:00
Aidan C. Brady 39621a74b1 Added config to display profiled portable tanks 2015-03-20 22:46:26 -05:00
Ben Spiers d560ea91a8 Move lighting config to general. 
Hopefully fixes whatever weird issue was going on before.
 2015-03-19 12:47:36 +00:00
Aidan C. Brady ff91bf72fe Added new "machines" section to config - specifically enable or disable any core Mekanism machinery, including options to remove already-existing machinery from worlds 2015-03-05 13:48:01 -05:00
Aidan C. Brady b2e532964c Merge branch 'master' into development 
Conflicts:
	src/main/java/mekanism/common/CommonProxy.java
	src/main/java/mekanism/common/Mekanism.java
	src/main/java/mekanism/common/item/ItemAtomicDisassembler.java
	src/main/java/mekanism/common/network/PacketConfigSync.java
	src/main/java/mekanism/generators/common/MekanismGenerators.java
 2015-03-04 14:30:05 -05:00
Ben Spiers f2859cacbb Rename EnergyUtils to UnitDisplayUtils 2015-02-27 17:33:14 +00:00
Ben Spiers fa9588d557 Add a proper temperature display utility 2015-02-27 17:33:14 +00:00
Aidan C. Brady 62791baec7 Solar Evaporation Plant fixes 2015-02-24 14:11:26 -05:00
Aidan C. Brady 888d1bdad8 Deuterium production is complete - use heavy water electrolysis instead of centrifuge recipe 2015-02-24 10:59:03 -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
Ben Spiers b5f3d77b83 Making a start on Gas Centrifuge. 2014-12-19 02:23:42 +00: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 9eb9eab91d Added in a fun little silk touch multiplier config 2014-09-27 15:07:55 -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
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 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 779759ac1e Make the sound config options apply again. 2014-08-30 02:37:02 +01:00
Ben Spiers 2a52ba36af Make SoundHandler static, remove some unneeded stuff. 2014-08-30 01:51:42 +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 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
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
Ben Spiers 12f9753ac5 Move Laser range and usage to config 2014-08-04 20:42:04 +01: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