tilera/Mekanism-tilera-Edition
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity
2284 commits 2 branches 0 tags 102 MiB
Commit graph

2284 commits

This branch
This branch
All branches
Author SHA1 Message Date
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 13f279eaa5 Merge branch 'development' into 1.8 
Conflicts:
	src/main/java/mekanism/common/EnergyNetwork.java
 2014-08-07 23:45:47 -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
Aidan Brady 81d3d53d76 Merge branch 'development' into 1.8 
Conflicts:
	src/main/java/mekanism/client/ClientTickHandler.java
	src/main/java/mekanism/common/item/ItemConfigurator.java
	src/main/java/mekanism/common/tile/TileEntityElectricPump.java
	src/main/java/mekanism/generators/client/gui/GuiSolarGenerator.java
 2014-08-07 12:29:43 -04:00
Aidan Brady 008afaf359 Merge branch 'master' into development 2014-08-07 12:21:11 -04:00
Ben Spiers 91dbb7fcd6 Add CC IPeripheralProvider to Bounding, EnergyCube and Generator blocks 2014-08-07 17:17:22 +01:00
Ben Spiers 799f49d9b6 Move to Forge block rotation implementation. 
Hopefully the configurator should rotate more stuff now and more wrenches should be able to rotate our blocks
 2014-08-07 17:17:22 +01:00
Ben Spiers 2ba639f8fc Fix running with Forestry but not BC. 2014-08-07 03:58:01 +01:00
Aidan Brady 14b40d901a Started work on Range4D for new packet system 2014-08-06 18:49:32 -04:00
Aidan Brady 78c0cc4c7c Fixed an issue where networks would be forgotten, made shift-M turn jetpack off immediately, simplified network code a bit 2014-08-06 18:25:33 -04:00
Aidan Brady 321411ee3a Fixed incorrect Advanced Solar Generator generation rate display 2014-08-06 13:56:01 -04:00
Aidan Brady 08914da371 Fixed Electric Pump lag - was able to completely eliminate system of node cleaning while boosting performance immensely 2014-08-06 13:44:59 -04:00
Aidan Brady faad9762df Merge branch 'development' into 1.8 
Conflicts:
	build.properties
	src/main/java/mekanism/common/Mekanism.java
	src/main/java/mekanism/common/tile/TileEntityBin.java
	src/main/java/mekanism/common/tile/TileEntityFluidicPlenisher.java
	src/main/java/mekanism/generators/common/MekanismGenerators.java
	src/main/java/mekanism/generators/common/tile/TileEntityWindTurbine.java
	src/main/java/mekanism/tools/common/MekanismTools.java
 2014-08-06 12:56:37 -04:00
Aidan Brady 20dc1ae28a Bump version to 7.1.0. 2014-08-06 12:51:48 -04:00
Aidan Brady 7c8208026b Merge branch 'master' into development 2014-08-06 12:34:46 -04:00
Aidan Brady 1896a42afa Cleaned up that fix 2014-08-05 22:31:57 -04:00
Ben Spiers a865a19340 Implement canConnectEnergy so RF cables don't connect when they shouldn't 2014-08-06 02:51:25 +01:00
Aidan C. Brady 7a67fbf7ca Fluidic Plenisher now detects block updates directly below it, and will replace the block if necessary. Will also no longer replace other source blocks. 2014-08-05 21:27:10 -04:00
Aidan C. Brady 12215490f0 Fixed a Digital Miner oversight, fixed Bins losing NBT data and allow Bins to accept items with varying item damage 2014-08-05 20:58:22 -04:00
Aidan C. Brady 06c66d5fbe Tiny cleanup 2014-08-05 17:07:09 -04:00
Aidan C. Brady 69874de9d2 Merge branch 'development' into 1.8 
Conflicts:
	src/main/java/mekanism/generators/client/gui/GuiWindTurbine.java
	src/main/java/mekanism/generators/common/GeneratorsCommonProxy.java
	src/main/java/mekanism/generators/common/MekanismGenerators.java
	src/main/java/mekanism/generators/common/tile/TileEntityHeatGenerator.java
	src/main/java/mekanism/generators/common/tile/TileEntityWindTurbine.java
 2014-08-05 17:06:29 -04:00
Aidan C. Brady 87c7d888f5 Merge branch 'master' into development 2014-08-05 16:56:02 -04:00
Aidan C. Brady 873af4be2e Cleanup 2014-08-05 16:55:55 -04:00
Aidan C. Brady ed9db80245 Merge branch 'development' of https://github.com/aidancbrady/Mekanism into development 2014-08-05 16:53:48 -04:00
Aidan C. Brady 27b61e288a Fixed a few bugs 2014-08-05 16:53:40 -04:00
Aidan aee18c0181 Merge pull request #1622 from bshelden/1614-powergen-config 
Added additional power generation configuration (#1164)
 2014-08-05 16:52:59 -04:00
Aidan 92cfc31223 Merge pull request #1625 from jstockwin/development 
Fixed some Electric Chest bugs
 2014-08-05 16:52:28 -04:00