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 |
|
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
|
7afef3f8ee
|
Fixed an API issue, implemented new default icon system to allow for dynamic factory icons based on recipe type
|
2015-03-26 17:10:32 -04:00 |
|
Aidan C. Brady
|
2d727b56ca
|
Fixed some naming - factories now display their complete names
|
2015-03-26 10:17:06 -04:00 |
|
Aidan C. Brady
|
d88f8a4606
|
Fixed upgrades not maintaining machine dataa
|
2015-03-25 23:51:46 -04:00 |
|
Aidan C. Brady
|
0e51852baa
|
Cleanup, fixed a transporter bug
|
2015-03-24 18:33:13 -04:00 |
|
Ben Spiers
|
0064f09d8c
|
Backwards-compatibility for IGasHandler. #2267
|
2015-03-22 14:36:21 +00:00 |
|
Aidan C. Brady
|
f8f1467304
|
Cleanup
|
2015-03-21 17:23:36 -05: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
|
0658e04880
|
Fix upgrade dupe with factories.
|
2015-03-21 19:12:55 +00:00 |
|
Ben Spiers
|
9936c05da7
|
Recipe and upgrade fixes.
|
2015-03-21 19:11:56 +00:00 |
|