Xander
|
b42a6b7ff9
|
cache factory recipe to avoid continuous lookup
|
2018-04-25 20:33:05 +08:00 |
|
Xander
|
c481c70c6c
|
Save infusion storage and gas tanks in machines. Fixes #4819
|
2018-03-25 12:22:56 +08:00 |
|
Aidan
|
bed953f0f0
|
Merge branch '1.12' into nonnull-network
|
2017-11-16 12:09:46 -05:00 |
|
Xander Victory
|
a86539f1a0
|
add gas handler methods for retrieving the tank infos regardless of side.
|
2017-11-10 15:23:48 +08:00 |
|
Xander Victory
|
2411a1be4d
|
change ArrayList<Object> to a non null list implementation for network data
|
2017-11-08 15:08:51 +08:00 |
|
Joseph C. Sible
|
6cafac7166
|
Make combining factories work again
|
2017-10-02 21:19:00 -04:00 |
|
aidancbrady
|
b295d65456
|
Fixed machine energy usage bug. May be worth porting back to 1.11
|
2017-08-16 22:55:51 -04:00 |
|
Tom Elfring
|
34e81bb65d
|
Remove ~350 unsave casts
|
2017-08-05 19:48:12 +02:00 |
|
Tom Elfring
|
babbe59cab
|
Cleanup
Removed unused imports
Add/remove all methods used for arrays
Removed manual array copy
|
2017-08-05 18:12:45 +02:00 |
|
Tom Elfring
|
b72d6efab3
|
Java 7 and 8 cleanup
Diamond operator <>
Lambdas and method references
|
2017-08-05 17:50:38 +02:00 |
|
aidancbrady
|
48c748e55e
|
Kill off some unused code
|
2017-07-26 14:04:26 -07:00 |
|
Chris Anderson
|
90cf4cea08
|
Add config caching overrides to TileEntityFactory
|
2017-07-25 11:06:48 -06:00 |
|
Tom Elfring
|
cc1320c71f
|
Fix smelting factories default max energy value.
Adresses #4510
|
2017-07-14 20:02:46 +02:00 |
|
aidancbrady
|
f4570f61d2
|
Make factories respect machine energy usage, fixed creative gas tanks and fluid tanks integer overflow
|
2017-05-27 15:12:51 -07:00 |
|
aidancbrady
|
5c956f47de
|
Added (configurable) Configurator mode sneak-scroll toggle
|
2017-05-27 14:44:38 -07:00 |
|
aidancbrady
|
808f0cdf8a
|
More refactoring, gave Rotary Condensentrator and Electrolytic Separator sound effects. Need to fix bugs
|
2017-04-27 22:51:44 -04:00 |
|
aidancbrady
|
2c161ed4ce
|
Better machine hierarchy to avoid repetition
|
2017-04-27 22:00:59 -04:00 |
|
aidancbrady
|
b3621cd511
|
Cap at max energy after energy upgrade removal
|
2017-04-27 20:53:06 -04:00 |
|
aidancbrady
|
c9cbb405d4
|
More API fixes
|
2017-04-13 16:15:26 -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
|
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
|
f00b35a017
|
Fixed Infusing Factory losing infuse storage, implement CTM model caching
|
2016-08-05 16:44:30 -04: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
|
88ead85f0e
|
Fixed Portable Teleporter issue, fixed compounded Factory localization, add upgrades support to Solar Neutron Activator
|
2016-07-16 12:16:55 -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
|
8c1b85768a
|
Fixed desync when upgrading factories
|
2016-06-22 13:37:46 -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
|
c9f8fd011e
|
Polished capabilities, still need to decide if we're allowed to ship capability references in API
|
2016-05-27 14:02:15 -04: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
|
d5656b0264
|
Merge branch 'development' into 1.8.9
* development:
Fixed Turbine Stats crash
Fixed Turbine container crash
Bumped version, fixed Steel Casing recipe, fixed erratic heat behavior, fixed Turbine render crash, added missing localization, fixed Bin crafting crash
ja_JP.lang - translate generators and ores tooltip, fix some entries
ja_JP.lang - translate general machinery and Blocks(without ores) tooltip.
ja_JP.lang - little fix/change
ja_JP.lang - fix/change some entries
ja_JP.lang - translate tooltip and gui text
ja_JP.lang - gui and tooltip translation progress
ja_JP.lang - fix/change some translation(items and blocks)
ja_JP.lang tweak some entries based on v9
Conflicts:
src/main/java/mekanism/common/Mekanism.java
src/main/java/mekanism/common/util/RecipeUtils.java
|
2016-05-21 15:31:26 -04:00 |
|
aidancbrady
|
0e0f9584f3
|
Bumped version, fixed Steel Casing recipe, fixed erratic heat behavior, fixed Turbine render crash, added missing localization, fixed Bin crafting crash
|
2016-05-21 13:52:28 -04:00 |
|
aidancbrady
|
be863a4289
|
Add Mekanism Shaped and Mekanism Shapeless recipe handlers, use ItemDataUtils to consolidate non-subtype-based NBT data into a single compound
|
2016-05-19 18:48:59 -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 |
|
aidancbrady
|
374cc57515
|
Use new GlStateManager methods, got armor models to render (though the transformations seriously need to be updated)
|
2016-05-10 22:24:37 -04:00 |
|
aidancbrady
|
758bc49515
|
Factory textures & block states, working perfectly
|
2016-05-05 18:45:40 -04:00 |
|
aidancbrady
|
754d0a1e31
|
Merge branch 'development' into 1.8.9
* development:
Remove old assets
Fixed factory upgrade issue
|
2016-05-04 16:50:39 -04:00 |
|
aidancbrady
|
39f604311a
|
Fixed factory upgrade issue
|
2016-05-04 14:02:15 -04:00 |
|
Ben Spiers
|
0cb18773aa
|
Merge branch 'development' into 1.8.9
|
2016-04-25 16:08:06 +01:00 |
|
Ben Spiers
|
78c2afb5ea
|
Actually get it compiling again.
Seems to run ok, I think?
|
2016-04-25 13:11:26 +01:00 |
|
aidancbrady
|
2838794ec3
|
Factory installers now maintain security
|
2016-04-22 07:56:15 -04:00 |
|