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
85c67666ad
Merge branch 'development' into 1.8.9
2016-05-01 23:57:29 +01:00
aidancbrady
c4520a072b
Crash fixes
2016-04-30 01:24:14 -04:00
Ben Spiers
8064beb0fc
Fix compile errors from merge
2016-04-25 17:47:54 +01: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
aidancbrady
9d22b7277c
Added new models
2016-03-24 00:33:28 -04:00
aidancbrady
9c480954e3
Polished security desk interface and machine interaction. Need to start integrating now, so far only complete in metallurgic infuser
2016-03-21 13:30:59 -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
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
4e4d98427b
Some more models
2016-02-18 14:13:45 +00: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
0179ea1f38
Mostly rendering improvements
2016-02-01 23:42:30 +00: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
de7bff08d5
Fixed inventory transition
2016-01-29 22:12:51 -07: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
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
bd3bc4402f
Fix Metallurgic Infuser upgrade slot conflict
2015-12-31 14:25:26 -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
6ec5a0a2fe
Fixed Metallurgic Infuser output slot
2015-03-29 01:38:03 -04:00
Aidan C. Brady
d061792f3e
Actually fix println
2015-03-22 01:33:25 -05:00
Aidan C. Brady
84759daacd
Fixed Metallurgic Infuser not switching to inactive state
2015-03-20 23:04:33 -05:00
David Vierra
30684d6aef
Fix Metallurgic Infuser not auto-ejecting output
...
Fixes #2268
(it was trying to auto-eject energy cells :P)
I checked all of the other TileComponentEjector instances for similar errors, the rest of them look okay.
2015-03-20 14:16:23 -10:00
Aidan C. Brady
8d83ada60f
Fixed a Laser Amplifier & Laser Tractor Beam inventory crash, fixed missing sounds for Chargepad, Chemical Crystallzer, Chemical Washer & Metallurgic Infuser
2015-03-20 01:30:11 -04:00
Halvor Lyche Strandvoll
97e51e0c26
Cleanup, cleared some warnings.
2015-03-18 13:51:14 +01:00
Aidan C. Brady
6870b211c5
Oredictionificator work
2015-03-13 10:20:19 -05:00
Aidan C. Brady
8ce105d95f
More configuration work
2015-03-08 13:27:34 -05:00
Aidan C. Brady
1f59f8ca1d
Finished implementation of sided energy configuration. Yay!
2015-03-08 00:59:39 -06: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
25df777b84
Work on fusion fuel creation mechanics, allowed Chemical Washer to accept upgrades
2015-02-17 21:27:35 -05:00
Ben Spiers
b31aa92844
Update lots of APIs, most notably BC and an actual 1.7 version of CC
...
Conflicts:
build.properties
src/api/java/buildcraft/api/core/BlockIndex.java
src/api/java/buildcraft/api/core/BuildCraftAPI.java
src/api/java/buildcraft/api/fuels/IFuel.java
src/api/java/buildcraft/api/mj/BatteryObject.java
src/api/java/buildcraft/api/mj/IBatteryIOObject.java
src/api/java/buildcraft/api/mj/IBatteryObject.java
src/api/java/buildcraft/api/mj/IOMode.java
src/api/java/buildcraft/api/mj/MjAPI.java
src/api/java/buildcraft/api/mj/MjBattery.java
src/api/java/buildcraft/api/power/PowerHandler.java
src/api/java/buildcraft/api/recipes/CraftingResult.java
src/api/java/buildcraft/api/recipes/IAssemblyRecipeManager.java
src/api/java/buildcraft/api/recipes/IFlexibleRecipe.java
src/api/java/buildcraft/api/recipes/IRefineryRecipeManager.java
src/api/java/buildcraft/api/transport/IPipe.java
src/main/java/mekanism/common/CommonProxy.java
src/main/java/mekanism/common/EnergyNetwork.java
src/main/java/mekanism/common/FuelHandler.java
src/main/java/mekanism/common/Mekanism.java
src/main/java/mekanism/common/base/IAdvancedBoundingBlock.java
src/main/java/mekanism/common/multipart/MultipartMekanism.java
src/main/java/mekanism/common/multipart/PartLogisticalTransporter.java
src/main/java/mekanism/common/multipart/PartUniversalCable.java
src/main/java/mekanism/common/network/PacketConfigSync.java
src/main/java/mekanism/common/tile/TileEntityAdvancedBoundingBlock.java
src/main/java/mekanism/common/tile/TileEntityElectricBlock.java
src/main/java/mekanism/common/util/CableUtils.java
src/main/java/mekanism/common/util/MekanismUtils.java
src/main/java/mekanism/common/util/TransporterUtils.java
src/main/java/mekanism/generators/common/MekanismGenerators.java
src/main/java/mekanism/generators/common/tile/TileEntityBioGenerator.java
src/main/java/mekanism/generators/common/tile/TileEntityGasGenerator.java
src/main/java/mekanism/generators/common/tile/TileEntityGenerator.java
src/main/java/mekanism/generators/common/tile/TileEntityHeatGenerator.java
src/main/java/mekanism/generators/common/tile/TileEntitySolarGenerator.java
src/main/java/mekanism/generators/common/tile/TileEntityWindTurbine.java
2014-11-13 19:30:39 +00:00
Ben Spiers
e84f176583
Add pulse mode to redstone control.
...
(I am going somewhere with this)
2014-09-16 02:47:54 +01:00
Ben Spiers
b75ff5d9a1
Cache all the things.
...
(Provided those things are computationally expensive to recalculate, and the memory cost of caching them is less than the time cost of recalculating them each time.)
2014-09-06 21:14:49 +01:00
Ben Spiers
3160ec0691
Cleanup imports again.
2014-09-05 18:32:54 +01:00
Ben Spiers
c7a429177b
More work in the quest for greater recipe efficiency.
2014-09-05 04:20:12 +01:00
Ben Spiers
ce6946c669
Massive recipe system overhaul.
...
They should be much more efficient now (this reduced the tick time of the CI Chamber by 3-4x in my testing), due to being able to just use the HashMap's get() instead of being limited to iterating through entries. NEI integration code now a lot more readable and type-safe as well.
2014-09-04 04:26:55 +01:00