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 |
|
aidancbrady
|
b83257d83b
|
Fixed Wind Generator model, fixed crashes
|
2016-03-21 21:07:02 -04:00 |
|
aidancbrady
|
a18da2ad27
|
Integrate security into more machines
|
2016-03-21 18:25:27 -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
|
97eeeb5ed3
|
Better Factory energy usage display, added new reactor LUA commands
|
2016-03-17 09:28:45 -04: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
|
866c76bafe
|
Redesigned Filter Cards to serve as Configuration Cards, fixed inventory interaction bug, fixed Creative Energy Cube bug, added new recipes
|
2016-03-05 13:17:58 -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
|
dd99f582af
|
State & Render stuffs, get the MInfuser rendering again.
Still no textures. WIP.
|
2016-01-27 01:36:39 +00:00 |
|
Ben Spiers
|
a27c9b6839
|
tile package done, except for TEDigitalMiner
|
2016-01-25 04:36:00 +00:00 |
|
Ben Spiers
|
dedc84605f
|
getInventoryName() -> getName()
|
2016-01-23 14:24:42 +00:00 |
|
Ben Spiers
|
4ef5840ff9
|
stackTagCompound -> getTagCompound()
|
2016-01-23 14:15:58 +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 |
|
Ben Spiers
|
9b8d9d92d6
|
Start update to 1.8.9
Fix all references to cpw.mods.fml namespace
|
2016-01-14 19:22:48 +00:00 |
|
aidancbrady
|
99fc98faf5
|
Fixed HolidayManager
|
2016-01-08 12:24:27 -05:00 |
|
aidancbrady
|
c7fe1f86eb
|
Cleaner CC support with a separate peripheral handler
|
2015-07-20 12:28:18 -07:00 |
|
aidancbrady
|
ee709cc202
|
New computer integration for the rest of Mekanism machinery
|
2015-07-20 11:43:49 -07:00 |
|