aidancbrady
|
2c161ed4ce
|
Better machine hierarchy to avoid repetition
|
2017-04-27 22:00:59 -04:00 |
|
aidancbrady
|
01ab160ff9
|
Transition from null stacks to ItemStack.EMPTY
|
2017-03-29 01:08:36 -04:00 |
|
aidancbrady
|
6a42eb64e3
|
Update to 1.11.2. Untested, still using outdated MCMP
|
2017-03-25 20:35:26 -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
|
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
|
b77ca6ff0c
|
Revert "Remove deprecated gas API methods"
This reverts commit c5a414df37.
|
2016-06-30 01:03:13 -04:00 |
|
aidancbrady
|
c5a414df37
|
Remove deprecated gas API methods
|
2016-06-29 19:58:13 -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
|
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
|
a89b8f666c
|
<200 errors. All I have left is a bit of rendering work and the new "off hand" stuff
|
2016-05-25 17:30:22 -04:00 |
|
aidancbrady
|
273e89a3b2
|
Get gas API completely working with capabilities
|
2016-05-23 13:45:17 -04:00 |
|
aidancbrady
|
b618263e69
|
Remove deprecated IGasHandler methods, properly implement AlloyInteraction and GasHandler capabilities
|
2016-05-23 12:44:05 -04:00 |
|
aidancbrady
|
c002ac6d8a
|
Glow Panels render in item form, use getEffectiveSide() instead of isRemote when checking packet security
|
2016-05-18 19:06:36 -04:00 |
|
aidancbrady
|
20bd989687
|
Merge branch 'development' into 1.8.9
* development:
Fixed packet security
Fixed 'other dust' registration
Better fake player reporting, thanks to @DraksterAU
Conflicts:
src/main/java/mekanism/common/item/ItemOtherDust.java
src/main/java/mekanism/common/multipart/PartLogisticalTransporter.java
src/main/java/mekanism/common/tile/TileEntityBasicBlock.java
src/main/java/mekanism/common/tile/TileEntityBasicMachine.java
src/main/java/mekanism/common/tile/TileEntityBin.java
src/main/java/mekanism/common/tile/TileEntityBoilerCasing.java
src/main/java/mekanism/common/tile/TileEntityBoundingBlock.java
src/main/java/mekanism/common/tile/TileEntityChargepad.java
src/main/java/mekanism/common/tile/TileEntityChemicalCrystallizer.java
src/main/java/mekanism/common/tile/TileEntityChemicalDissolutionChamber.java
src/main/java/mekanism/common/tile/TileEntityChemicalInfuser.java
src/main/java/mekanism/common/tile/TileEntityChemicalOxidizer.java
src/main/java/mekanism/common/tile/TileEntityChemicalWasher.java
src/main/java/mekanism/common/tile/TileEntityDigitalMiner.java
src/main/java/mekanism/common/tile/TileEntityDynamicTank.java
src/main/java/mekanism/common/tile/TileEntityElectricPump.java
src/main/java/mekanism/common/tile/TileEntityElectrolyticSeparator.java
src/main/java/mekanism/common/tile/TileEntityEnergyCube.java
src/main/java/mekanism/common/tile/TileEntityFactory.java
src/main/java/mekanism/common/tile/TileEntityFluidTank.java
src/main/java/mekanism/common/tile/TileEntityFluidicPlenisher.java
src/main/java/mekanism/common/tile/TileEntityFuelwoodHeater.java
src/main/java/mekanism/common/tile/TileEntityGasTank.java
src/main/java/mekanism/common/tile/TileEntityInductionCell.java
src/main/java/mekanism/common/tile/TileEntityInductionPort.java
src/main/java/mekanism/common/tile/TileEntityInductionProvider.java
src/main/java/mekanism/common/tile/TileEntityLaser.java
src/main/java/mekanism/common/tile/TileEntityLogisticalSorter.java
src/main/java/mekanism/common/tile/TileEntityMetallurgicInfuser.java
src/main/java/mekanism/common/tile/TileEntityMultiblock.java
src/main/java/mekanism/common/tile/TileEntityResistiveHeater.java
src/main/java/mekanism/common/tile/TileEntityRotaryCondensentrator.java
src/main/java/mekanism/common/tile/TileEntitySeismicVibrator.java
src/main/java/mekanism/common/tile/TileEntitySolarNeutronActivator.java
src/main/java/mekanism/common/tile/TileEntityThermalEvaporationController.java
src/main/java/mekanism/generators/common/tile/TileEntityGenerator.java
src/main/java/mekanism/generators/common/tile/reactor/TileEntityReactorController.java
src/main/java/mekanism/generators/common/tile/turbine/TileEntityTurbineCasing.java
|
2016-05-17 14:23:57 -04:00 |
|
aidancbrady
|
7ae60615e2
|
Fixed packet security
|
2016-05-17 13:49:55 -04:00 |
|
Ben Spiers
|
0cb18773aa
|
Merge branch 'development' into 1.8.9
|
2016-04-25 16:08:06 +01:00 |
|
aidancbrady
|
2838794ec3
|
Factory installers now maintain security
|
2016-04-22 07:56:15 -04:00 |
|
Ben Spiers
|
84336ec4d1
|
Merge branch 'development' into 1.8.9
Huge merge with 202 conflicts, hopefully not *too* broken.
|
2016-03-18 04:24:19 +00:00 |
|
aidancbrady
|
d77de295f2
|
Modified factory-capable machine side data to match that of factories, allowing for configuration preservation
|
2016-03-05 19:33:02 -05:00 |
|
aidancbrady
|
9b9ed0a4c0
|
Polished resistive heaters, fixed a small bug in the sound system (a bit uncleanly)
|
2016-02-27 01:27:26 -05:00 |
|
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
|
22bf688fbd
|
Muffling Upgrades! Mute individual machine volumes.
|
2016-02-02 22:55:26 -05: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 |
|
aidancbrady
|
5aaea55900
|
Infusing Factories. They're finally here
|
2016-01-29 21:13:05 -07:00 |
|
Ben Spiers
|
62e7cc8f65
|
Merge branch 'v9' into 1.8.9
|
2016-01-30 00:47:54 +00:00 |
|
aidancbrady
|
a22b33a629
|
Energy Cubes and Gas Tanks now have configurable item inputs and gas/energy outputs, fixed Portable Tank item output
|
2016-01-29 00:34:50 -05:00 |
|
Ben Spiers
|
a27c9b6839
|
tile package done, except for TEDigitalMiner
|
2016-01-25 04:36:00 +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 |
|
aidancbrady
|
a94c13edc7
|
Implement new computer framework in primary machines
|
2015-07-20 11:09:44 -07:00 |
|
aidancbrady
|
f5979e26bc
|
Fixed Purification Chamber issue
|
2015-06-05 09:56:21 -04:00 |
|
aidancbrady
|
654bce3c7d
|
Fixed advanced machine item input logic
|
2015-05-23 11:44:19 -04:00 |
|
Aidan C. Brady
|
5fec517a6d
|
Crash fix
|
2015-04-10 08:34:02 -04:00 |
|
Aidan C. Brady
|
e4d624d8ab
|
Fancy new eject algorithms, should fix issues with PRC
|
2015-03-30 19:27:54 -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
|
d88f8a4606
|
Fixed upgrades not maintaining machine dataa
|
2015-03-25 23:51:46 -04:00 |
|
Ben Spiers
|
0064f09d8c
|
Backwards-compatibility for IGasHandler. #2267
|
2015-03-22 14:36:21 +00:00 |
|
Ben Spiers
|
c323969c87
|
Recalcuation things.
|
2015-03-21 19:44:17 +00:00 |
|
Ben Spiers
|
83e41478e5
|
Localisation, icon, fixes.
|
2015-03-21 19:13:15 +00:00 |
|
Ben Spiers
|
2e8edb281c
|
Gas Upgrades.
|
2015-03-21 19:13:04 +00:00 |
|
Ben Spiers
|
9936c05da7
|
Recipe and upgrade fixes.
|
2015-03-21 19:11:56 +00:00 |
|
Ben Spiers
|
b817b2840c
|
Fix Generator Tiles' client/server sidedness
|
2015-03-19 00:36:29 +00:00 |
|
Aidan C. Brady
|
8ce105d95f
|
More configuration work
|
2015-03-08 13:27:34 -05:00 |
|
Aidan C. Brady
|
e70650154d
|
Added energy config readiness to all configurable machines, still yet to actually implement energy management
|
2015-03-07 23:55:22 -06:00 |
|
Aidan C. Brady
|
d4d7e88c4e
|
Developed and implemented the foundation for Item/Gas/Energy/Fluid/Heat dynamic side configuration.
As of now, only items are supported, and the actual config GUI has not been changed. Only gameplay difference is three new configurator modes.
|
2015-03-07 19:09:23 -05:00 |
|
Aidan C. Brady
|
55ed9cd1f1
|
Fixed machines not saving state after being installed
|
2015-03-05 14:43:29 -05:00 |
|
Aidan C. Brady
|
abd581b2f1
|
Factory Installers are done!
|
2015-03-05 08:24:00 -05:00 |
|
Aidan C. Brady
|
2fe4cf290d
|
Merge branch 'master' into development (@unpairedbracket, make sure I did this right)
Conflicts:
src/main/java/mekanism/common/tile/TileEntityAdvancedElectricMachine.java
src/main/java/mekanism/common/util/MekanismUtils.java
|
2015-02-19 16:12:28 -05:00 |
|
Ben Spiers
|
17f9f88b34
|
Prevent Osmium Compressor and Combiner from using secondary energy upgrades.
Also make them deterministic again to prevent them getting stuck
|
2015-02-19 16:36:16 +00:00 |
|
Ben Spiers
|
49be30de34
|
Merge branch 'development' into v8
Conflicts:
src/main/java/mekanism/common/tile/TileEntityAdvancedElectricMachine.java
src/main/java/mekanism/common/tile/TileEntityFactory.java
src/main/java/mekanism/common/util/MekanismUtils.java
|
2014-12-14 19:04:03 +00:00 |
|