Ben Spiers
41e118ba2e
Merge branch 'development' into 1.8
2014-08-14 23:37:28 +01:00
Ben Spiers
7813fad1ab
Make redstone-split transmitters join correctly again. Presumably this being broken is why merge() was unused.
2014-08-14 23:30:27 +01:00
Ben Spiers
e4c2692e64
Fix not sending tile updates
2014-08-14 23:05:32 +01:00
Ben Spiers
dc922a3914
Remove two entirely unreferenced Config variables from the config class.
...
logPackets is unused as well, but is still present in the config file.
Presumably got lost in the 1.7 update. @aidancbrady, should we reimplement
the functionality, or remove the option?
2014-08-13 03:38:55 +01:00
Ben Spiers
9739068822
Make Glow Plastic microblocks glow.
2014-08-13 03:37:05 +01:00
Ben Spiers
22d80c2953
Make reinforced plastic blocks actually harder and more explosion-resistant than the others
2014-08-13 03:36:47 +01:00
Ben Spiers
ddc67b475a
Microblock-enable our blocks.
...
Use IMC where custom materials aren't necessary to leave as much as possible up to CB.
2014-08-12 23:24:52 +01:00
Aidan C. Brady
9f91e0886e
Gave the Upgrade Management GUI a scrollbar to allow for more than 4 upgrade types to be present in a single machine
2014-08-11 15:15:09 -04:00
Aidan C. Brady
237f2cbab5
Merge branch '1.8' of https://github.com/aidancbrady/Mekanism into 1.8
2014-08-11 12:31:51 -04:00
Aidan C. Brady
1833bc0796
Implemented InvTweaks API. @unpairedbracket, mind sorting out the @Optional stuff for this? I'm not sure how to do that with annotations.
2014-08-11 12:31:40 -04:00
Ben Spiers
60130d0616
Restrict the creative frequencies to creative-moded players.
2014-08-11 00:56:23 +01:00
Ben Spiers
84c13e098c
Add creative frequencies to the entangled blocks.
...
Adds the uility of being able to generate "infinite" (Integer.MAX_VALUE) amounts of fluids or gases.
2014-08-11 00:55:48 +01:00
Aidan C. Brady
0bab2c21e6
Quick fix
2014-08-10 16:13:23 -04:00
Aidan C. Brady
ee47115b5a
Finished off GuiScrollList and implemented it in the Dictionary :)
2014-08-10 16:11:29 -04:00
Aidan Brady
c38d0e4828
A bit more work
2014-08-10 00:23:26 -04:00
Aidan Brady
62743cfda7
Merge branch '1.8' of https://github.com/aidancbrady/Mekanism into 1.8
2014-08-10 00:14:19 -04:00
Aidan Brady
89bc7edc95
Started work on a scroll list GUI element
2014-08-10 00:14:12 -04:00
Ben Spiers
de880c5ab0
Make Pressurized Tubes able to pull from IGasHandlers. Hopefully I didn't screw anything up too badly.
2014-08-10 03:34:01 +01:00
Aidan Brady
c66f3a44b7
Merge branch '1.8' of https://github.com/aidancbrady/Mekanism into 1.8
2014-08-09 22:20:59 -04:00
Aidan Brady
1d6de974d3
A bit of package reorganization, added InventoryNetwork to transporters
2014-08-09 22:20:49 -04:00
Ben Spiers
191d964003
More Entanglement work. Now has a gui, can set it's frequency.
2014-08-10 02:17:02 +01:00
Aidan C. Brady
98ee002472
Merge back the network fixes
2014-08-09 13:43:59 -04:00
Aidan C. Brady
e032eb0370
Fixed the network CME (badly), also added "dustWood" as an OreDict entry for Sawdust
2014-08-09 13:42:13 -04:00
Aidan C. Brady
ef9741af7f
Fixed cable functionality
2014-08-09 13:29:04 -04:00
Aidan C. Brady
a3c6b9dac2
Fixed cable functionality
2014-08-09 13:28:40 -04:00
Aidan Brady
cbc1bae8e8
Fixed a connected texture renderer bug
2014-08-08 22:43:46 -04:00
Aidan C. Brady
05a7bf3bf7
Made the statistics tab a bit neater
2014-08-08 22:35:40 -04:00
Aidan C. Brady
50ebdf930d
Slot overlay no longer displays when reactor is not formed
2014-08-08 22:26:41 -04:00
Aidan C. Brady
bfddd56c3f
Fixed Flamethrower positioning
2014-08-08 22:18:01 -04:00
Aidan C. Brady
3b53614bd2
Merge branch 'development' into 1.8
...
Conflicts:
src/main/java/mekanism/common/tile/TileEntityDynamicTank.java
src/main/java/mekanism/common/tile/TileEntitySalinationValve.java
src/main/java/mekanism/common/util/CableUtils.java
2014-08-08 22:11:45 -04:00
Aidan C. Brady
d4039d7f4b
Fix the no-update issues
2014-08-08 22:09:14 -04:00
Aidan C. Brady
ed919fa19a
Fixed the no-update issues
2014-08-08 22:08:55 -04:00
Aidan Brady
a0b8ab0331
Quick cleanup
2014-08-08 21:25:59 -04:00
Aidan Brady
4d4926d0df
Fixed Dynamic Tanks not updating when being filled with buckets. I knew I missed something.
2014-08-08 21:21:28 -04:00
Ben Spiers
40659dcdac
Very start of a working teleportation system. Works for Energy and Fluids, probably Gases. Not Items yet.
2014-08-09 02:08:38 +01:00
Ben Spiers
f596848240
Fix some deprecation warnings
2014-08-08 23:20:30 +01:00
Ben Spiers
520bf46332
Fix my typo
2014-08-08 21:51:37 +01:00
Aidan C. Brady
76d2997a6b
A quick fix
2014-08-08 15:09:42 -04:00
Aidan C. Brady
9566e25ba6
Merge branch 'development' into 1.8
...
Conflicts:
src/main/java/mekanism/common/Mekanism.java
src/main/java/mekanism/common/util/CableUtils.java
2014-08-08 14:46:37 -04:00
Aidan C. Brady
3523d03274
Digital Miner now mines blocks one chunk at a time - this will make the chunkloading upgrade easy.
2014-08-08 14:45:09 -04:00
Ben Spiers
cf18bc45a2
Remove unnecessary entity registrations - registerModEntity does it for us. Pray to any and all applicable supernatural entities that this solves the (EntityLivingBase)EntityBalloon crash
2014-08-08 18:25:47 +01:00
Aidan C. Brady
c04fdd4432
Started work on PathfinderCache - this will store paths that have been already calculated for later use. When a path becomes possibly invalidated, it is removed from the cache.
2014-08-08 00:13:17 -04:00
Aidan C. Brady
6ff0a147e4
More fixes
2014-08-08 00:00:33 -04:00
Aidan C. Brady
4a07fd7491
A few more fixes
2014-08-07 23:48:22 -04:00
Aidan C. Brady
312c8ef127
Push back those fixes
2014-08-07 23:45:30 -04:00
Aidan C. Brady
c040e14fdf
EnergyNetwork fixes
2014-08-07 23:42:20 -04:00
Aidan C. Brady
d5508667f3
Merge branch 'development' into 1.8
...
Conflicts:
src/main/java/mekanism/common/item/ItemBlockEnergyCube.java
src/main/java/mekanism/common/multipart/PartTransmitter.java
src/main/java/mekanism/common/tile/TileEntityBasicMachine.java
src/main/java/mekanism/common/tile/TileEntityBin.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/TileEntityFactory.java
src/main/java/mekanism/common/tile/TileEntityMetallurgicInfuser.java
src/main/java/mekanism/common/tile/TileEntityPortableTank.java
src/main/java/mekanism/common/tile/TileEntityRotaryCondensentrator.java
src/main/java/mekanism/common/tile/TileEntitySeismicVibrator.java
src/main/java/mekanism/common/tile/TileEntityTeleporter.java
src/main/java/mekanism/generators/common/tile/TileEntityGenerator.java
2014-08-07 23:02:11 -04:00
Aidan C. Brady
12ad58b1f9
Turns out I was sending a ton of packets to the entire player list on the server when it wasn't actually necessary at all, switched to new sendToReceivers() method
2014-08-07 22:48:35 -04:00
Aidan C. Brady
7634c29df9
Merge branch 'development' of https://github.com/aidancbrady/Mekanism into development
2014-08-07 21:33:23 -04:00
Aidan C. Brady
1fd5e498e8
Major packet improvements - trying to get on the good side of server owners. More to come.
...
Instead of sending to all players in a dimension or within a defined range, packets will now only be sent to players who have the chunk loaded that the packet is being sent from on the server.
2014-08-07 21:33:17 -04:00
