Xander Victory
2411a1be4d
change ArrayList<Object> to a non null list implementation for network data
2017-11-08 15:08:51 +08:00
Tom Elfring
837e2f7f30
Disable stacking empty FluidTanks
2017-10-12 18:54:55 +02:00
aidancbrady
5b6ec73117
Fixed Quantum Entangloporter crash
2017-08-16 23:21:32 -04:00
Tom Elfring
049c780888
Move mod id references to a constant
2017-08-07 20:16:16 +02:00
Tom Elfring
5bcdb2b2be
Merge remote-tracking branch 'upstream/1.11' into 1.12
2017-08-07 20:09:31 +02:00
Tom Elfring
29615cc6a9
Merge branch '1.11' of github.com:aidancbrady/Mekanism into 1.11
2017-08-07 20:00:52 +02:00
Tom Elfring
2e38fb9748
Fix some mod integrations not working.
...
Moved all mod id definitions to a constant value in MekanismHooks.
Fix integration with ComputerCraft, OpenComputers and IC2.
Fix #4603
2017-08-07 19:59:32 +02:00
aidancbrady
b40cd5c20e
Merge branch '1.11' into 1.12
...
* 1.11:
add a couple of comments [no-ci]
add Anchor Upgrade to Entangleporter
Store Quantum Entangleporter frequency (name and public/private only) in the itemstack when dismantled. Displayed in the sneak key info tooltip.
Increase Entangleporter frequency to be able to store as much as ultimate tiers can transmit.
static field access to Class access
Conflicts:
src/main/java/mekanism/common/frequency/Frequency.java
src/main/java/mekanism/common/tile/TileEntityQuantumEntangloporter.java
2017-08-05 19:43:27 -07:00
Tom Elfring
34e81bb65d
Remove ~350 unsave casts
2017-08-05 19:48:12 +02:00
Tom Elfring
b72d6efab3
Java 7 and 8 cleanup
...
Diamond operator <>
Lambdas and method references
2017-08-05 17:50:38 +02:00
Xander
81e56b207c
Store Quantum Entangleporter frequency (name and public/private only) in the itemstack when dismantled. Displayed in the sneak key info tooltip.
2017-08-05 22:49:50 +08:00
Tom Elfring
c9dc4c0ac0
Merge remote-tracking branch 'upstream/1.11' into 1.12
2017-08-04 18:49:20 +02:00
aidancbrady
5bd67b37b2
Fixed IC2 integration
2017-07-31 19:41:24 -07:00
Tom Elfring
e9957ad895
Make redstoneflux an optional dependency
2017-07-23 13:59:18 +02:00
Tom Elfring
df68b1e36a
Merge remote-tracking branch 'upstream/1.11' into 1.12_firstpass
2017-07-23 13:56:41 +02:00
Aidan
cb675a9e5d
Merge pull request #4543 from thommy101/issue-3802
...
[1.11] Make empty containers stackable.
2017-07-22 20:03:39 -07:00
Tom Elfring
1aaf49cdf9
Merge remote-tracking branch 'upstream/1.11' into 1.12_firstpass
2017-07-21 18:46:26 +02:00
Tom Elfring
b24cbb797a
Make empty containers stackable.
...
Makes Cardboardboxes, gastanks and fluidtanks stackable. Bins are already stackable.
Fixes #3802
2017-07-19 11:33:17 +02:00
Tom Elfring
f6c126af44
Add max energy to tooltips
2017-07-17 20:27:05 +02:00
Tom Elfring
84271c04d9
Cleanup getMaxEnergy
2017-07-17 14:44:38 +02:00
Tom Elfring
f1e273ff5f
Fix getMaxEnergy for factories.
...
Fixes pickBlock and dropped block max energy from being limited to 0.
2017-07-16 19:42:06 +02:00
Tom Elfring
5ef94efa3d
Update to new RF API
2017-06-27 13:36:16 +02:00
Tom Elfring
0a670c1e0b
Merge upstream
2017-06-20 19:36:05 +02:00
aidancbrady
471563e083
Better ItemStack packet management
2017-06-17 13:31:46 -07:00
Tom Elfring
2eabbe4b38
First pass 1.12 port
2017-06-15 15:01:45 +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
808f0cdf8a
More refactoring, gave Rotary Condensentrator and Electrolytic Separator sound effects. Need to fix bugs
2017-04-27 22:51:44 -04:00
Tom Elfring
f493221381
Fix more UUID changes. Fix Robit owner.
...
Fixes : #4342 and #4345 .
2017-04-26 18:50:46 +02:00
aidancbrady
6f2b84e547
Totally refactor frequencies to use UUIDs instead of player usernames
2017-04-24 14:15:43 -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
0baf510473
Fixed Hohlraum damage bar, fixed multiblock inventory modification, better volume maintenance, fixed fluid items, crash fixes
2017-03-29 17:20:34 -04:00
aidancbrady
0e9f380bd7
Forge Energy support, added full functionality for Tesla
2017-03-29 12:56:20 -04:00
aidancbrady
6a42eb64e3
Update to 1.11.2. Untested, still using outdated MCMP
2017-03-25 20:35:26 -04:00
aidancbrady
c510ce7d8c
Merge branch '1.7.10' into 1.10
...
* 1.7.10:
Added version-based handling, bump version to 9.1.1
Bump up Dynamic Tank max storage, fixed Factory container issue
Add config option to disable block protections
Fixed chunk churning issue with frames
Restrict Thermal Evaporation Plant output to needed
Going back to MIT, thanks to the concerns of @bshelden and @asiekierka
Conflicts:
build.properties
src/main/java/mekanism/api/MekanismConfig.java
src/main/java/mekanism/common/CommonProxy.java
src/main/java/mekanism/common/Mekanism.java
src/main/java/mekanism/common/ThreadGetData.java
src/main/java/mekanism/common/block/BlockBounding.java
src/main/java/mekanism/common/item/ItemBlockEnergyCube.java
src/main/java/mekanism/common/item/ItemBlockGasTank.java
src/main/java/mekanism/common/item/ItemBlockMachine.java
src/main/java/mekanism/common/network/PacketConfigSync.java
src/main/java/mekanism/generators/common/MekanismGenerators.java
src/main/java/mekanism/generators/common/item/ItemBlockGenerator.java
src/main/java/mekanism/tools/common/MekanismTools.java
2016-11-27 13:33:57 -05:00
Clienthax
03191f198b
Add config option to disable block protections
2016-08-15 02:58:15 +01:00
aidancbrady
ac4148c01b
Creative Gas Tanks!
2016-08-07 20:40:28 -04:00
aidancbrady
3b07db3dc0
Fixed Mechanical Pipe crash, fixed Induction Cell issue, added Creative Fluid Tank and removed prefilled tanks
2016-08-07 19:58:45 -04:00
aidancbrady
e8513f4dca
Fixed bounding block placement, fixed texture registration
2016-07-20 14:42:21 -04:00
aidancbrady
05dea8a5b6
Fixed custom item rotation, fixed recipes, fixed fluid container items
2016-07-08 23:49:13 -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
52daff9f67
Better tooltips
2016-07-06 17:53:14 -04:00
aidancbrady
333cc7ff27
Completed Tesla support, using a handy new system of wrapper-abstracted item and tile capability handlers
2016-07-02 01:27:49 -04:00
aidancbrady
53353cd050
Fixed IC2 support (still may crash without), begin adding Tesla support
2016-07-01 11:05:02 -04:00
aidancbrady
202f917345
Begin porting fluid items
2016-06-30 10:41:55 -04:00
aidancbrady
1cc41c8722
Update IC2 API
2016-06-22 12:13:18 -04:00
aidancbrady
a5f4457677
Merge branch 'development' into 1.9.4
...
* development:
Update pt_BR.lang
Allow shift-right clicking machines with upgrades
Fixed NBT reference losses
Fixed Thermal Evaporation Controller computer integration
Add config option for transmitter alloy upgrades
Fixed transmitter crash, fixed entangloporter frequency issue, fixed PRC muffling upgrades
Conflicts:
src/main/java/mekanism/client/render/RenderPartTransmitter.java
src/main/java/mekanism/common/FluidNetwork.java
src/main/java/mekanism/common/item/ItemAlloy.java
src/main/java/mekanism/common/item/ItemUpgrade.java
src/main/java/mekanism/common/util/PipeUtils.java
2016-06-15 20:41:32 -04:00
aidancbrady
6340bb3cdc
Fixed NBT reference losses
2016-06-10 11:30:03 -04:00
aidancbrady
ceec3e71e9
No more errors, the game launches, rejoice!
2016-05-26 03:14:44 -04:00
aidancbrady
79af86daae
~80 errors remaining. Need to properly add offhand support for most items
2016-05-25 23:48:28 -04:00