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
2,691 Commits 9 Branches 76 Tags
24935dd51ef44c2748d988f6079a4548c3772618
Commit Graph
66 Commits
Author SHA1 Message Date
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 5767bfb22e Work on Solar Neutron Activator and its recipe system 2015-02-26 17:23:53 -05:00
Aidan C. Brady 999502a053 Half-implemented Solar Neutron Activator 2015-02-25 11:11:30 -05:00
Aidan C. Brady 62791baec7 Solar Evaporation Plant fixes 2015-02-24 14:11:26 -05:00
Aidan C. Brady 457d465165 Fix a few renames 2015-02-24 11:08:04 -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 98d1a647cb Rename Salination Plant to Solar Evaporation Plant 2015-02-23 08:08:54 -05:00
Ben Spiers b5f3d77b83 Making a start on Gas Centrifuge. 2014-12-19 02:23:42 +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
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
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
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
Porter Westling 986e0ac1b4 add config for salination plant water transformation per update 2014-09-24 09:31:47 -07: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 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 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 b29f2adc4d LASERS 2014-09-14 05:20:16 +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 2a52ba36af Make SoundHandler static, remove some unneeded stuff. 2014-08-30 01:51:42 +01:00
Ben Spiers 896c943758 Cleaning up unused stuff and 3-space tabs (?) 2014-08-27 23:55:35 +01: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
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
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
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 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
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
Aidan C. Brady aaffc3e364 Updated some imports and added textures 2014-07-26 16:45:48 -04:00
Ben Spiers 775ba68482 Tweaking of lasers for packet-efficiency 2014-07-22 22:34:19 +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
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 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 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 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
Ben Spiers bdde617489 More work on Fusion Reactor 2014-07-16 02:54:13 +01:00
Aidan C. Brady 9abc111ecd Baby Skeletons, started work on Flamethrower 2014-07-12 22:34:58 -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