Commit Graph
57 Commits
Author SHA1 Message Date
Ben Spiers 9a3f0ae633 Version Number Update: 8.1.7 2015-07-28 18:46:00 +01:00
aidancbrady 7607a135ce Bump version to 8.1.6 2015-06-23 15:20:03 -07:00
aidancbrady aec238dde5 Version bump, improved Rotary Condensentrator crafting recipe, made Solar Evaporation Controller use new gauge standards 2015-06-11 19:59:19 -04:00
aidancbrady 3cd05489d9 Bump version to 8.1.4 2015-05-29 23:19:43 -04:00
aidancbrady 1377ec88e8 Fixed circuit OreDict implementation 2015-05-10 19:45:09 -04:00
aidancbrady 3185f1bf22 Bumped version to 8.1.3 2015-05-05 10:45:59 -04:00
Aidan Brady 8030b0e057 Fixed icons, bumped Mekanism version to 8.1.2, bumped Forge to 1395, updated CB libraries 2015-04-25 13:14:10 -07:00
Aidan C. Brady a03ef85f4c Fixed compile, bumped version to 8.1.1 2015-04-10 08:24:28 -04:00
Aidan C. Brady 8d38f63f5f Bumped version to 8.1.0 2015-04-01 23:09:27 -04:00
Aidan C. Brady b4c2664c5e Work a bit on a new, dynamic ejector system 2015-03-30 08:39:37 -04:00
Aidan C. Brady 6ce51b0b8d Finished Reactor Logic Adapter 2015-03-29 16:02:57 -04:00
Aidan C. Brady 0f54c21cf2 More work on logic adapter 2015-03-29 14:47:09 -04:00
Aidan C. Brady 2546d9c28e Bump version to 8.0.3 2015-03-26 18:08:56 -04:00
Aidan C. Brady d2c6effabb Bump version to 8.0.2 2015-03-22 21:57:28 -04:00
Ben Spiers 4590a71759 Make the checking of instances of other mods' interfaces safer.
Fixes (part of) #2316
2015-03-23 01:11:45 +00:00
Aidan C. Brady 8173af50e0 Bump version to 8.0.1 - preparing to fix some bugs 2015-03-20 15:28:20 -04:00
Aidan C. Brady f51c528bbf Added recipes for new v8 content 2015-03-15 17:57:15 -04:00
Aidan C. Brady 35518ad01f Fixed some tooltips, Hohlraum now properly accepts D-T fuel, added Hohlraum recipe, added lithium to EIM recipes 2015-03-06 07:50:09 -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
Brian Lewis 112c1a1ba9 Add ethylene burn time as a config entry 2015-03-03 10:05:10 -06:00
Aidan C. Brady 29e50a34fa Merge branch 'master' into development
Conflicts:
	src/main/java/mekanism/common/Mekanism.java
	src/main/java/mekanism/common/item/ItemBlockMachine.java
	src/main/java/mekanism/generators/common/MekanismGenerators.java
2015-02-24 10:42:55 -05:00
Aidan C. Brady d2f941e630 Recipe fixes, fixed Portable Tank filling 2015-02-24 10:32:41 -05:00
Ben Spiers 0cef749249 Actually increment the Mod classes' versions 2015-02-13 14:40:14 +00: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 2507bd3ecb Fix some merge dodginess. 2014-11-13 22:18:26 +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 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 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 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
Ben Spiers 3418438d6c Update version to 7.1.1 due to Configurator ehancements. 2014-09-05 16:56:45 +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
Aidan Brady 1d6de974d3 A bit of package reorganization, added InventoryNetwork to transporters 2014-08-09 22:20:49 -04:00
Aidan Brady 20dc1ae28a Bump version to 7.1.0. 2014-08-06 12:51:48 -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
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
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
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 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 b2e676aabb Fixed an API issue, fixed Robit nametag not updating, fixed Sorter Mod ID filter bugginess 2014-07-31 18:41:27 -04: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
Aidan C. Brady 22b3097d15 Laser model! Also added some new Reactor Block assets. 2014-07-24 23:02:30 -04: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
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
Ben Spiers df58560729 Clean up configs a lot; Fix Config GUIs. This will require people to sort out their configs on their own, as things have moved. 2014-07-07 21:23:04 +01:00
Ben Spiers ff1b3b792e Config GUIs are cool. 2014-06-27 03:22:46 +01:00
Ben Spiers 611d4c8f52 Got some IC2 stuff working now. Turns out I was being stupid. 2014-06-26 18:18:18 +01:00
Ben Spiers 9c58ed549f Start of work on Doing It Right™. Appears to work for cofh's API, not yet for IC2 or BC. Not sure why. Might have to ask @cpw. 2014-06-26 01:10:53 +01:00