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

476 commits

Author SHA1 Message Date
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
Aidan C. Brady afd3b52123 Merge branch '1.8' of https://github.com/aidancbrady/Mekanism into 1.8 2014-08-05 16:23:24 -04:00
Aidan C. Brady dd2eb3a0fd Fixed an electric chest crash 2014-08-05 16:22:59 -04:00
Ben Spiers 6f9e13a798 Add passive and steam generation Stats to reactor. 2014-08-05 02:43:03 +01:00
Ben Spiers dffee5a8e3 Add Statistics tab to Reactor 
Some more stats could be displayed here, regarding energy generation.
 2014-08-05 01:39:17 +01:00
Ben Spiers 12f9753ac5 Move Laser range and usage to config 2014-08-04 20:42:04 +01:00
jstockwin 8509ebab18 Stop pipes connecting to front of Heat Generator. 
Prevents Mechanical Pipes connecting to the front (energy output) side of the Heat Generator.
Currently they physically connect, leading you to assume they are
transferring the lava, however they are not as this is the energy output
side and it does not accept lava.
 2014-08-04 20:35:39 +01:00
Ben Spiers 9652b7adf6 Allow top/bottom to interact with charging slot 
Might add side configuration and ejectors and stuff later, but fixes #1281. (Sorry it took so long.)
 2014-08-04 20:15:10 +01:00
Ben Spiers 432eab1bcf Move LaserManager out of api to fix some import errors. 2014-08-04 14:10:40 +01:00
Ben Spiers 03a7252d7a Fix controller texture on items 2014-08-04 02:05:23 +01:00
Ben Spiers fad0da2c15 Fix a deprecated method 2014-08-04 01:09:44 +01:00
Ben Spiers 2d3dda245a Get all registered fluids to show up in Portable tanks in NEI. 2014-08-04 01:08:49 +01:00
Ben Spiers 1c71614c4a Properly localise fluid names on machine blocks 2014-08-04 01:01:15 +01:00
Ben Spiers 14852b0b5d Move some more code into the Blocks and Items classes, and fix the ObjectHolder annotations. Don't think it's going to be possible to make the Tools items work with ObjectHolder (they'd need to be final fields I think) because the material enums need to be initialised first. 2014-08-03 20:27:20 +01:00
Ben Spiers 2048083e11 Fix energy cubes not coming from NEI charged 2014-08-03 20:27:20 +01:00
Ben Spiers 7c123a9fa1 Fix Factory container slot ids 2014-08-03 20:27:20 +01:00
Aidan C. Brady 04987a5626 Merge branch 'master' into development 2014-08-03 02:52:40 -04:00
Ben Spiers 32a52c5f03 Fix the BuildCraft leak quickly 
This is already solved in development branches but that commit would pull in a bunch of other stuff as well.
 2014-08-03 03:14:17 +01:00
Ben Spiers 9f0e564013 Fix some Server-side packets being sent by the client 
Conflicts:
	src/main/java/mekanism/common/tile/TileEntityEnergyCube.java
 2014-08-03 02:48:59 +01:00
jstockwin 79ce886df2 Fixed some Electric Chest bugs 
Electric Chest was not updating when it was (un)locked, meaning that
mechanical pipes would not (dis)connect and reconnect.

Also noticed that Electric Chest won't accept transporters connecting to
the bottom, which I thought was odd, however it looked intentional so I
left it alone. (..?)

Also made it so electric chests will not open if there is a solid block
above them.
 2014-08-03 01:00:16 +01:00
Byron Shelden 020d347ee3 Added additional power generation configuration (#1164) 
* Can now configure heat generator power from adjacent lava
 * Can now configure heat generator power from the nether
 * Wind power is now configured by specifying minimal and maximal Y levels and generation values.
    * Defaults to 60J/t at Y 24 and 480J/t at Y 255
 2014-08-02 12:56:41 -07:00
Aidan Brady 8e10c4fbf7 Fixed panel harvest levels 2014-08-02 14:00:19 -04:00
Aidan Brady 33970b6bf7 Updated Multiblock Controller textures, added multi-meta capability to Connected Texture Renderer 2014-08-02 11:16:14 -04:00
Aidan Brady 19cfb7b8d6 Generalized the actual manager, and the data manager (by means of reflection) 2014-08-02 00:10:29 -04:00
Aidan Brady c97f617692 Generalized some of the multiblock code into a stricter format 2014-08-01 23:44:28 -04:00
Aidan Brady 8f6cf7e1c9 Merge branch '1.8' of https://github.com/aidancbrady/Mekanism into 1.8 2014-08-01 22:28:18 -04:00
Aidan Brady d1bef0b7e3 Fixes! The new system just about works, I just need to work on Dynamic Tank inventory merging. 2014-08-01 22:28:13 -04:00
Ben Spiers e0e54523fb Remove some bad imports 2014-08-02 00:49:46 +01:00
Ben Spiers 34b4742798 Start on framework for energy/fluid/gas/item teleportation 2014-08-02 00:49:00 +01:00
Aidan Brady 548c5b0835 More work, currently broken 2014-08-01 15:49:03 -04:00
Aidan Brady fc7dd3e65a Started on a new, more modular approach to controller-less multiblocks, allowing for the creation of the EIM 2014-08-01 13:04:31 -04:00
Aidan Brady 1cfe6fc352 Started work on implementation of Dynamic Tank cache merging, fixed Salination Tank not rendering at height 3, made sure all multiblocks load after partial chunk load 2014-08-01 01:33:54 -04:00
Aidan Brady 4090fcf490 Reactor now auto-forms 2014-08-01 00:55:24 -04:00
Aidan Brady 22db67c895 Spacing cleanup 2014-07-31 22:27:46 -04:00
Aidan Brady dde9b53447 Fixed the addition of the "creative control circuit" 2014-07-31 21:08:46 -04:00
Aidan Brady d9bb5845cd Naming standards :) 2014-07-31 20:55:01 -04:00
Ben Spiers 725b7463f0 Make the mod classes significantly less godlike. 
Move Config variables into their own class, (in api because other stuff in API references config, may make sense to move it back to common later), and move Blocks and Items into final variables in their own classes. It looks a lot cleaner this way and my OCD can finally rest now.
 2014-08-01 01:35:06 +01:00
Aidan Brady 6762f416d3 Glowing lasers and laser amplifier model! 2014-07-31 19:46:31 -04:00
Aidan Brady 6e975ee632 Made them really infinite 2014-07-31 19:29:49 -04:00
Aidan Brady da35b509fd Creative Energy Cube now won't be drained of or receive power. 2014-07-31 19:19:03 -04:00
Aidan Brady ed4aa7671c Merge branch 'development' into 1.8 
Conflicts:
	src/main/java/mekanism/common/EnergyNetwork.java
 2014-07-31 19:00:54 -04:00
Aidan Brady 7e378dd796 Fixed Atomic Disassembler issue 2014-07-31 18:57:18 -04:00
Aidan Brady b2e676aabb Fixed an API issue, fixed Robit nametag not updating, fixed Sorter Mod ID filter bugginess 2014-07-31 18:41:27 -04:00
Aidan Brady 269343f9f0 Revert back to the old method of power distribution to fix BuildCraft issues. We shouldn't try to make up for other mods' bugs. 2014-07-31 18:17:03 -04:00
Aidan Brady 285423d4b1 Merge branch 'development' into 1.8 2014-07-31 18:08:12 -04:00
Aidan Brady 4a70449899 Merge branch 'master' into development 2014-07-31 18:07:58 -04:00
Aidan 56e6cbcb55 Merge pull request #1590 from Tonius/patch-1 
Various fixes to jetpack-related rendering
 2014-07-31 18:04:28 -04:00
Aidan 057c4d0ea8 Merge pull request #1596 from mymagadsl/patch-3 
Update zh_TW.lang
 2014-07-31 18:03:37 -04:00
Ben Spiers 5f83a42fc8 Make some textures more transparent to get a better look at the fusion plasma. 2014-07-31 22:58:20 +01:00
Ben Spiers a6ff4750e4 Fusion reactor NBT save/load, and a first attempt at plasma render. Fusion reactor is basically finished at this point. 2014-07-31 22:57:30 +01:00
Ben Spiers d7c060d6fb Update BC API and fix up EnergyNet and CableUtils to work with the new MjAPI 2014-07-31 18:41:32 +01:00
Ben Spiers d8321196d9 Oops 2014-07-31 16:02:55 +01:00
Ben Spiers 4faa733106 Merge branch 'development' into 1.8 2014-07-31 15:59:30 +01:00
Ben Spiers 59dab7c848 Move StackUtil to api package for not causing errors. 2014-07-31 15:58:02 +01:00
Ben Spiers 1b54cfbb50 More laser amplifier changes 2014-07-31 15:56:07 +01:00
Ben Spiers d4f05c8b99 Some cleanup of MekanismUtils and more EnergyDisplay changes to use our energy units. 
Because who the hell ever uses siemens, anyway?
 2014-07-31 15:55:03 +01:00
Ben Spiers 26bc15ac3b Adding Lit Redstone Ore to OreDict is well and truly broken. 2014-07-31 15:53:24 +01:00
Ben Spiers b62c5c8a3a Get basic functionality working for the Laser Amplifier. No mode changing yet, and using the laser model in lieu of the actual one. 2014-07-30 22:26:03 +01:00
Ben Spiers bfe3b545d2 Merge branch 'development' into 1.8 2014-07-30 15:15:42 +01:00
Ben Spiers 78addc3303 Stop a potential NPE in Gas Gauges. 2014-07-30 15:14:54 +01:00
Ben Spiers 2b7300bfa3 Stop a potential NPE in Gas Gauges. 2014-07-30 15:09:27 +01:00
mymagadsl cf53322e18 Update zh_TW.lang 2014-07-30 01:24:33 +08:00
Ben Spiers 6f4e0da3c5 Fix a small advanced solar placement bug. 2014-07-28 23:11:08 +01:00
Ben Spiers 9413950842 Merge branch 'development' into 1.8 2014-07-28 17:33:38 +01:00
Ben Spiers c339ee7a18 Merge branch 'master' into development 2014-07-28 17:33:09 +01:00
Ben Spiers c97464649d Fix trying to use IC2 EnergyNet without IC2 installed. It would never work anyway. 2014-07-28 17:20:31 +01:00
Ben Spiers 1d52a4f5a0 Add a Creative Energy Cube that's always half-full so it can sink or provide arbitrary amounts of energy. 2014-07-28 17:18:33 +01:00
Ben Spiers 38b554266e Add tabs to Fuel and Heat GUIs to get to the other one. 2014-07-28 17:17:42 +01:00
Ben Spiers f21568d5f8 Textures for Fusion Fluids 2014-07-28 17:16:56 +01:00
Ben Spiers cf4df0941b Fix a crash casting null to float 2014-07-28 15:05:53 +01:00
Ben Spiers 5dcd9abd0f Add an injection rate text field 2014-07-28 15:04:55 +01:00
Aidan Brady 9696ad246c Merge branch '1.8' of https://github.com/aidancbrady/Mekanism into 1.8 2014-07-28 09:27:16 -04:00
Aidan Brady 1ad7fe81b9 Salination Plant now auto-forms 2014-07-28 09:27:08 -04:00
Tonius fef1fb6fb6 Committed the other files I meant to commit. 2014-07-28 15:01:58 +02:00
Tonius d6cf9a8e90 Various fixes to rendering 
Fixed:
 - Jetpack particles being too dark
 - Jetpack particles flickering towards the world origin
 - Jetpack HUD showing in almost every screen
 - RenderTickHandler still ticking when the game is paused
 2014-07-28 15:01:27 +02:00
Ben Spiers e2913e2520 Work on reactor GUI. 
Three different screens now because there's so much information. Still need an option on the fuel screen to set the injection rate and a proper button to form the multiblock.
 2014-07-28 04:24:56 +01:00
Ben Spiers e004fdca98 Merge branch 'development' into 1.8 
Conflicts:
	src/main/java/mekanism/generators/common/tile/TileEntityHeatGenerator.java
 2014-07-27 20:53:00 +01:00