Commit Graph
308 Commits
Author SHA1 Message Date
aidancbrady 6f2b84e547 Totally refactor frequencies to use UUIDs instead of player usernames 2017-04-24 14:15:43 -04:00
aidancbrady c9cbb405d4 More API fixes 2017-04-13 16:15:26 -04:00
aidancbrady c7a74d239b Better MekanismGenerators config GUI, removed reactor API, better reactor recipe management 2017-04-13 14:42:25 -04:00
aidancbrady b355b80cf4 Fixed mod IDs, fixed generator recipes, added enabling/disabling of generators via config 2017-04-13 01:42:02 -04:00
aidancbrady 4733420eee API improvements 2017-04-12 20:23:16 -04:00
aidancbrady ac8de88413 Cleanup 2017-04-10 23:29:04 -04:00
Tom Elfring 19780e5a07 Fix mcmp startup crash and missing import 2017-04-08 11:22:00 +02:00
aidancbrady 810c089040 Fix some fluid issues 2017-04-05 10:17:36 -04:00
aidancbrady 2b8ce30b57 Fix MCMP dependence for good 2017-04-05 10:10:04 -04:00
aidancbrady acde30dee3 More gas changes 2017-04-04 19:49:44 -04:00
aidancbrady 3d86b75da4 Better gas management 2017-04-04 19:45:51 -04:00
aidancbrady 2071cb3760 Fix multipart breaking 2017-03-29 18:44:41 -04:00
aidancbrady c12f1c1e6f Add IItemHandler support to (most) blocks, fixed machines rotating (thanks @Ricket) 2017-03-29 13:51:00 -04:00
aidancbrady 0e9f380bd7 Forge Energy support, added full functionality for Tesla 2017-03-29 12:56:20 -04:00
aidancbrady 01ab160ff9 Transition from null stacks to ItemStack.EMPTY 2017-03-29 01:08:36 -04:00
aidancbrady 2aad738c3d Temporarily disable multipart functionality, got transmitters to work, reorganize multipart code 2017-03-28 22:49:29 -04:00
aidancbrady c89d7d49b9 Bump version, temporary asset purge 2017-03-28 21:04:58 -04:00
aidancbrady 2f705768e4 Work on overhaul of transmitters 2017-03-28 19:32:32 -04:00
aidancbrady 6a42eb64e3 Update to 1.11.2. Untested, still using outdated MCMP 2017-03-25 20:35:26 -04:00
aidancbrady 2b02042f4c Bump version for release 2017-03-24 11:28:26 -04:00
aidancbrady c96d13a2e6 Merge branch 'master' into 1.10
* master:
  Added compressed diamond, obsidian, and redstone to the ore dictionary.
2017-03-08 18:54:19 -05:00
Jason Spradlin 328e5bb993 Added compressed diamond, obsidian, and redstone to the ore dictionary. 2017-02-25 02:48:24 -06:00
Tom Elfring 8450aeb548 Remove deploader, depend on MCMP fixes #3991 2016-11-21 14:40:54 +01:00
aidancbrady b6d5a34121 Bump version to 9.2.1 2016-09-12 16:40:16 -04:00
aidancbrady 2d04343683 Fixed CTM crash, fixed Chunk Loader CPU usage, added new BioFuel recipes 2016-09-05 15:07:22 -04:00
aidancbrady 7dfc9db949 Bump version to 9.2, add Minecraft version-based version handling 2016-08-11 12:15:16 -04:00
aidancbrady 8e1ee9a581 Chunk Loader Upgrades. They work with Digital Miners and automatically adjust to their mining radius. 2016-08-10 15:37:29 -04:00
aidancbrady a3eeda8e10 Fixed shapeless recipes, fixed dye colors 2016-08-10 11:44:07 -04:00
aidancbrady a9177a0989 Bump version to 9.1.1 2016-08-05 21:28:23 -04:00
aidancbrady dce74d4459 Fixed Precision Sawmill duplication 2016-07-20 23:47:51 -04:00
aidancbrady 51342603d4 Merge branch 'development' into 1.9.4
* development:
  Completed Opaque Transmitter implementation. Yay!
  Fix Reactor Ports, again
  Bump up Electrolytic Separator gas output
  Fixed Reactor Port crash
  compleatly replaced files
  removed the word "opaque" in all image names
  added boolean opaque
  added boolean opaque
  loaded config before Tier.init()
  added new opaque images

Conflicts:
	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/PartThermodynamicConductor.java
	src/main/java/mekanism/common/multipart/PartUniversalCable.java
	src/main/java/mekanism/common/multipart/TransmitterIcons.java
	src/main/java/mekanism/common/network/PacketTransmitterUpdate.java
	src/main/java/mekanism/generators/common/tile/reactor/TileEntityReactorPort.java
2016-07-19 15:19:04 -04:00
Marcel Petzold a25217aab1 loaded config before Tier.init() 2016-07-16 20:02:41 +02:00
aidancbrady 6e0a63c3ee Merge branch 'development' into 1.9.4
* development:
  Better Structural Glass recipe
  Fixed Portable Teleporter issue, fixed compounded Factory localization, add upgrades support to Solar Neutron Activator

Conflicts:
	src/main/java/mekanism/common/Mekanism.java
	src/main/java/mekanism/common/network/PacketPortableTeleporter.java
	src/main/java/mekanism/common/tile/TileEntityFactory.java
	src/main/java/mekanism/common/tile/TileEntitySolarNeutronActivator.java
2016-07-16 12:26:58 -04:00
aidancbrady 1d51dd34dc Better Structural Glass recipe 2016-07-16 12:20:56 -04:00
aidancbrady cb6682266d Completely transition everything to use new fluid system, including Forge's UniversalBucket. No more old references! 2016-07-12 17:35:24 -04:00
aidancbrady 05dea8a5b6 Fixed custom item rotation, fixed recipes, fixed fluid container items 2016-07-08 23:49:13 -04:00
aidancbrady 7b48129909 Merge branch 'development' into 1.9.4
* development:
  Add necessary networking to Reactor Port
  Better tooltips
  Actually fix tier installers
  Add Silicon crusher recipe, fixed Tier Installers
  Rename Factory Installer to Tier Installer, add recipe for Saturating Condenser, add tier upgrade support for Energy Cube, Gas Tank, Fluid Tank and Bin
  Bump version to 9.1, add Laser Amplifier comparator support, add Saturating Condensers to recycle water from Industrial Turbines

Conflicts:
	build.properties
	src/main/java/mekanism/common/Mekanism.java
	src/main/java/mekanism/common/MekanismItems.java
	src/main/java/mekanism/common/item/ItemFactoryInstaller.java
	src/main/java/mekanism/common/tile/TileEntityAdvancedElectricMachine.java
	src/main/java/mekanism/common/tile/TileEntityBin.java
	src/main/java/mekanism/common/tile/TileEntityElectricMachine.java
	src/main/java/mekanism/common/tile/TileEntityFactory.java
	src/main/java/mekanism/common/tile/TileEntityFluidTank.java
	src/main/java/mekanism/common/tile/TileEntityGasTank.java
	src/main/java/mekanism/common/tile/TileEntityLaserAmplifier.java
	src/main/java/mekanism/common/tile/TileEntityMetallurgicInfuser.java
	src/main/java/mekanism/generators/common/block/BlockGenerator.java
	src/main/java/mekanism/generators/common/block/BlockReactor.java
	src/main/java/mekanism/generators/common/tile/reactor/TileEntityReactorPort.java
	src/main/resources/assets/mekanism/textures/blocks/ctm/ReactorPort-ctm.png
	src/main/resources/assets/mekanism/textures/blocks/ctm/ReactorPort.png
	src/main/resources/assets/mekanism/textures/blocks/ctm/ReactorPortInput-ctm.png
	src/main/resources/assets/mekanism/textures/blocks/ctm/ReactorPortInput.png
	src/main/resources/assets/mekanism/textures/blocks/ctm/reactor_port-ctm.png
	src/main/resources/assets/mekanism/textures/blocks/ctm/reactor_port.png
2016-07-06 18:38:29 -04:00
aidancbrady 28846dcb73 Rename Factory Installer to Tier Installer, add recipe for Saturating Condenser, add tier upgrade support for Energy Cube, Gas Tank, Fluid Tank and Bin 2016-07-06 17:21:24 -04:00
aidancbrady 95c0ad4a73 Bump version to 9.1, add Laser Amplifier comparator support, add Saturating Condensers to recycle water from Industrial Turbines 2016-07-06 16:56:24 -04:00
aidancbrady e6da7fdc9c Update to latest Forge, use Capability standards. Need to port to new fluid system 2016-06-23 16:34:27 -04:00
aidancbrady 286394f7ac Merge branch 'development' into 1.9.4
* development:
  Fixed Bin amount render position
  Bump version to 9.0.3, change Wind Generator weather category, fix Logistical Sorter sound config bypass, fixed Thermal Evaporation Plant internal render

Conflicts:
	build.properties
	src/main/java/mekanism/client/render/tileentity/RenderBin.java
	src/main/java/mekanism/common/Mekanism.java
	src/main/java/mekanism/common/tile/TileEntityThermalEvaporationController.java
	src/main/resources/assets/mekanism/sounds.json
2016-06-22 14:29:27 -04:00
aidancbrady 44ecdd41d0 Bump version to 9.0.3, change Wind Generator weather category, fix Logistical Sorter sound config bypass, fixed Thermal Evaporation Plant internal render 2016-06-22 14:20:22 -04:00
aidancbrady fa24e0e780 Isolate MDK, update build script. Gonna try to get this pushing to the dev server 2016-05-28 19:14:18 -07:00
aidancbrady eb7c2d1b78 Merge branch 'development' into 1.9.4
* development:
  Fixed Turbines unable to be formed in other dimensions
  Bump version to 9.0.2
  Fixed Personal Chest crash, bumped default Fuelwood Heater generation, added some null checks to prevent crashes
  Fixed outputting energy above Integer.MAX_VALUE to other mods, fixed tiered factories not supporting muffling upgrades, fixed boiler valve height interaction

Conflicts:
	src/main/java/mekanism/common/LaserManager.java
	src/main/java/mekanism/common/Mekanism.java
	src/main/java/mekanism/common/block/BlockMachine.java
	src/main/java/mekanism/common/entity/EntityFlame.java
	src/main/java/mekanism/common/tile/TileEntityBoilerValve.java
	src/main/java/mekanism/common/tile/TileEntityDigitalMiner.java
	src/main/java/mekanism/common/tile/TileEntityLaser.java
	src/main/java/mekanism/common/tile/TileEntityLaserAmplifier.java
	src/main/java/mekanism/common/tile/TileEntityLaserTractorBeam.java
	src/main/java/mekanism/common/util/MekanismUtils.java
	src/main/java/mekanism/generators/common/tile/TileEntityAdvancedSolarGenerator.java
2016-05-28 02:34:55 -04:00
aidancbrady 02d2aa1550 Bump version to 9.0.2 2016-05-28 02:02:31 -04:00
aidancbrady ceec3e71e9 No more errors, the game launches, rejoice! 2016-05-26 03:14:44 -04:00
aidancbrady af008b9395 <1000 errors 2016-05-24 23:35:37 -04:00
aidancbrady c6a09b5658 <1500 errors 2016-05-24 21:22:39 -04:00
aidancbrady 3983cc858b Begin the great port. 2378 errors to go! 2016-05-24 20:04:40 -04:00
aidancbrady fa46db4ce6 Removed unused mtl and obj commands, got heat network (and conductors) working with capabilities 2016-05-24 18:47:43 -04:00