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
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
Ben Spiers d0d660b9d4 Merge branch 'master' into development 2014-07-27 20:45:53 +01:00
Ben Spiers 1d61c3d4e8 Tweak energynet logic a bit to safeguard against overly high tiers of IC2 acceptor and things that implement everything but with only one working. 
Should fix AE2 EU P2P tunnel support.
 2014-07-27 20:45:13 +01:00
Aidan C. Brady 31e24ecd1e Fixed default enchantibilities 2014-07-26 19:17:02 -04:00
Aidan C. Brady 3abd80f1a2 Generators now sustain fluid and gas data 2014-07-26 19:10:17 -04:00
Aidan C. Brady ce5bddbdd1 Merge branch 'development' into 1.8 
Conflicts:
	src/main/java/mekanism/common/block/BlockMachine.java
	src/main/java/mekanism/common/item/ItemBlockMachine.java
	src/main/java/mekanism/common/tile/TileEntityDigitalMiner.java
	src/main/java/mekanism/common/tile/TileEntityPRC.java
 2014-07-26 18:57:18 -04:00
Aidan C. Brady ab34edc46a Finished off new system of sustained data 2014-07-26 18:44:24 -04:00
Aidan C. Brady 94c3a6aa60 Started work on a new system of managing sustained data 2014-07-26 18:16:00 -04:00
Aidan C. Brady 7ac7fbc5cc Sustained gas and fluid support for Chemical Washer, Chemical Crystallizer and Chemical Infuser 2014-07-26 17:59:43 -04:00
Aidan C. Brady 2876eb535d Merge branch 'master' into development 2014-07-26 17:39:03 -04:00
Aidan C. Brady ba289ced25 Added sustained fluid and gas tanks to PRC and Electrolytic Separator, fixed Gas Generator losing energy when being picked up 2014-07-26 17:37:25 -04:00
Aidan C. Brady aaffc3e364 Updated some imports and added textures 2014-07-26 16:45:48 -04:00
Aidan 3d1b256632 Merge pull request #1576 from fewizz/patch-1 
Update ru_RU.lang
 2014-07-26 15:44:17 -04:00
fewizz f768dabd5f Update ru_RU.lang 2014-07-25 12:44:54 +04:00
jmongeon 1689031219 Fix Gas Generator not accepting Buildcraft fuels. 2014-07-24 23:07:11 -04:00
Aidan C. Brady 22b3097d15 Laser model! Also added some new Reactor Block assets. 2014-07-24 23:02:30 -04:00
Aidan C. Brady 5f268ae0b0 More texture updates 2014-07-24 18:30:46 -04:00
Aidan C. Brady b992d686e8 Updated some textures, also added textures for Laser and upcoming Neutronic Centrifuge 2014-07-24 18:00:18 -04:00
Aidan C. Brady 5bee3991d8 Merge branch 'development' into 1.8 
Conflicts:
	src/main/java/mekanism/common/tile/TileEntityEnergyCube.java
 2014-07-23 13:50:43 -04:00
Aidan C. Brady bb8985b6f8 Fixed a few energy transfer issues 2014-07-23 13:49:42 -04:00
Aidan C. Brady 2b5bb53bc6 Fixed a few recipe issues 2014-07-23 13:43:12 -04:00
Aidan C. Brady d8e94b00d2 Added effect information to upgrade GUI 2014-07-23 11:06:58 -04:00
Aidan C. Brady 52efdac614 Eliminated the deprecated "getSpeedMultiplier()" and "getEnergyMultiplier()" methods 2014-07-23 10:17:03 -04:00
Aidan C. Brady 523ec21467 Added button to remove upgrade, fixed font size. Almost done! 2014-07-22 22:16:20 -04:00
Aidan C. Brady 790cd33f2d Merge branch '1.8' of https://github.com/aidancbrady/Mekanism into 1.8 2014-07-22 20:37:59 -04:00
Aidan C. Brady 6470f69569 A big load of work on the new upgrade GUI 2014-07-22 20:37:53 -04:00
Ben Spiers 84daf186ca More Reactor GUI work 2014-07-23 01:25:10 +01:00
Ben Spiers 775ba68482 Tweaking of lasers for packet-efficiency 2014-07-22 22:34:19 +01:00
Ben Spiers c66676dd55 Fix some Server-side packets being sent by the client 2014-07-22 21:13:01 +01:00
Ben Spiers 327389a88c Get Lasers kind of working vs. dediservers 2014-07-22 21:11:43 +01:00
Ben Spiers dd421f7308 This should stop the servercrashing issue 2014-07-22 18:03:34 +01:00
Ben Spiers a2bb224bf5 Fix transmitter render pass to stop things occluding incorrectly, make lasers get stronger and weaker as they start and stop 2014-07-22 17:41:34 +01:00
Ben Spiers e35a673c8b Get lasers rendering. I've yet to proxy it off, so THIS WILL CRASH DEDICATED SERVERS 2014-07-22 03:41:30 +01:00
Ben Spiers 733da7396f Add LiquidChlorine meta file 2014-07-22 03:41:30 +01:00
Aidan C. Brady 99482d8fd0 Fixed a minor issue 2014-07-21 22:24:27 -04:00
Aidan C. Brady 25cf5236ea A few fixes 2014-07-21 21:33:43 -04:00
Aidan C. Brady 076c5f7377 More work! 2014-07-21 21:21:53 -04:00
Aidan C. Brady 2523d2fd6b Did some work on actual upgrade system 2014-07-21 20:46:35 -04:00
Aidan C. Brady 435596831e Merge branch 'development' into 1.8 2014-07-21 19:45:50 -04:00
Aidan C. Brady cdb1ad2ffe Attempted a fix for a strange connection error 2014-07-21 19:45:14 -04:00
Aidan C. Brady 0b8ec37164 More work on upgrade GUI, also made SimpleGui packets send new window ID to client 2014-07-21 19:15:27 -04:00
Aidan C. Brady e778449045 More work! Finished off the upgrade tab and removed upgrade slot from all upgrade-wielding containers. 2014-07-21 18:07:15 -04:00
Aidan C. Brady 48183f6670 Work on the new upgrade system, specifically with GUI changes 2014-07-21 17:47:29 -04:00
Aidan C. Brady f2441a1ebd Merge branch 'development' into 1.8 
Conflicts:
	src/main/java/mekanism/common/recipe/BinRecipe.java
	src/main/java/mekanism/common/tile/TileEntityChemicalInfuser.java
 2014-07-21 17:02:06 -04:00
Ben Spiers 5f26402bd9 Minor cleanup and tabs 2014-07-21 21:48:28 +01:00
Aidan C. Brady 0864e1061a Merge a few more fixes 2014-07-21 16:45:08 -04:00
Aidan C. Brady 27056da3e4 Merge back a few bug fixes 2014-07-21 16:41:27 -04:00
Aidan C. Brady 4fcd3b47c5 Fix a few little bugs 2014-07-21 16:34:31 -04:00
jstockwin 0a9dbec78c Stop energy cube core rendering when cube is empty. 
This will stop it from blocking out other rendering when it's not opaque
enough to be visible
 2014-07-21 21:14:12 +01:00
Aidan C. Brady d16483f4b1 Started work on the new upgrade system, as well as the new GUI 2014-07-21 14:57:31 -04:00
Aidan C. Brady 0416e2e904 Finished Digital Miner visual render functionality, also fixed a few issues with gas tanks 2014-07-21 13:30:39 -04:00
Aidan C. Brady 69a411813e Started work on a Digital Miner visual render thing. For some reason it's culling all oceans. 2014-07-21 01:10:53 -04:00
Aidan C. Brady 7e525e10c6 Fixed a few recipes, also started work on Digital Miner visual 2014-07-20 23:29:35 -04:00
Aidan C. Brady c1b317dcde Added in warning for missing stacks. Onto visual Digital Miner range rendering! 2014-07-20 21:20:45 -04:00
Aidan C. Brady 2b817e28cd Fixed an issue with Bins, also fixed a small GUI issue with the new filter system 2014-07-20 20:30:35 -04:00
Aidan C. Brady de86e0b2a2 Finished off the filtering system! Also added new "fuzzy mode" to ItemStack filters in order to ignore metadata checks. 2014-07-20 20:19:01 -04:00
Aidan C. Brady 4adb6de83d Fix a few bugs 2014-07-20 16:16:09 -04:00
Aidan C. Brady fe177d20c7 Filter-based replacing works! Now to get the require system to work and the warning system set up. 2014-07-20 16:06:47 -04:00
Aidan C. Brady ad505cf882 More work! Networking is just about complete, and all filter creation and edit GUIs now have replace stack slots and replace required buttons. 2014-07-20 15:45:44 -04:00
Aidan C. Brady e66d4c5d93 Merge branch 'development' into 1.8 2014-07-20 15:28:29 -04:00
Aidan C. Brady 545849f187 Merge branch 'master' into development 2014-07-20 15:28:18 -04:00
Aidan C. Brady ddc499c9fe More work on Digital Miner filter system, also fixed a little memory leak 2014-07-20 15:27:35 -04:00
sb023612 7660a828b8 Update zh_CN.lang 2014-07-20 21:01:54 +08:00
sb023612 fe845c21d9 Update zh_CN.lang 2014-07-20 20:56:15 +08:00
Aidan C. Brady 13afad3b0d Started work on new Digital Miner filter system 2014-07-19 19:55:34 -04:00
Aidan C. Brady a48a0101e9 Flamethrowers are just about polished! Just need to do a few more entity damage refinements. 2014-07-19 14:41:27 -04:00
Aidan C. Brady 00abd47b84 Merge branch '1.8' of https://github.com/aidancbrady/Mekanism into 1.8 2014-07-19 02:34:13 -04:00
Aidan C. Brady 87f92326f9 Work on flame vector calculation - still need to get it to catch blocks and entities on fire properly 2014-07-19 02:34:07 -04:00
Ben Spiers 7b8b75759c More GUI Work. Nowhere near finished yet, there's a lot of information to squeeze in. 2014-07-19 04:03:32 +01:00
Ben Spiers 2e7d3a1945 Work on making it work Client-side. 2014-07-19 03:23:11 +01:00
Ben Spiers 16e38fafbe Fix things, adjust the algorithm slightly to model the differential equation better. 2014-07-18 23:29:45 +01:00
Vexatos ad82a76a0d Update de_DE.lang 2014-07-18 09:57:03 +02:00
Aidan C. Brady 497997d0e4 Merge branch '1.8' of https://github.com/aidancbrady/Mekanism into 1.8 2014-07-18 01:35:03 -04:00
Aidan C. Brady cfc308b042 Flames now render how I want them to! Tomorrow I add logic, such as the burning of entities and the smelting of blocks. 2014-07-18 01:34:56 -04:00
Ben Spiers be15bab0b7 More Reactor work. Making way for persistent reactor state and guis and stuff. 2014-07-18 02:29:19 +01:00
Aidan C. Brady 9469fcb51a Started work on actual flame implementation 2014-07-17 20:06:51 -04:00
Aidan C. Brady 2f4d545fb5 Major Flamethrower work - finished networking and implemented active state management. Active sound effects work, too. 2014-07-17 17:18:53 -04:00
Aidan C. Brady c9f569fd4a Merge branch 'development' into 1.8 2014-07-17 01:44:54 -04:00
Aidan C. Brady 0a1afbae93 Fixed a major issue that was causing transmitter networks to be ticked twice in a single tick 2014-07-17 01:44:32 -04:00
Aidan C. Brady 186e6f5f05 Fix a silly bug with tile sounds I just created 2014-07-17 01:28:20 -04:00
Aidan C. Brady 7ddb8e9727 Merge branch 'development' into 1.8 
Conflicts:
	src/main/java/mekanism/client/ClientTickHandler.java
	src/main/java/mekanism/common/CommonProxy.java
	src/main/java/mekanism/common/Mekanism.java
 2014-07-16 23:59:07 -04:00
Aidan C. Brady cfeb08a8ee Fixed Gas Mask OP-ness, added config option to let creative mode override the Electric Chest, fixed Gas Generator crash 2014-07-16 23:53:00 -04:00
Aidan C. Brady 8ccf4e6653 Fixes! 2014-07-16 19:16:38 -04:00
Aidan C. Brady 4309a7d7b1 More work - SoundHandler now uses a channel-based system for sounds. 2014-07-16 17:07:54 -04:00
Aidan C. Brady be7ea115b6 Some work on flamethrower sounds, also refactored sound system to allow for multiple sounds from a single object reference (to allow flamethrower and jetpack sounds to work simultaneously) 2014-07-16 16:59:45 -04:00
Aidan C. Brady 6e5eca9d4e Merge branch '1.8' of https://github.com/aidancbrady/Mekanism into 1.8 2014-07-15 22:59:20 -04:00
Aidan C. Brady ee789547c6 A bit of work on flamethrower sound effect handling 2014-07-15 22:59:14 -04:00
Ben Spiers 8673440172 Reactor Logic work. More complex now, and more realistic, taking some cues from BigReactors' example. 
Plasma conducts temperature to the casing, which then conducts to coolant or the environment. Energy from passive cooling is stored in an internal buffer.
 2014-07-16 02:54:13 +01:00
Ben Spiers 62659afadb Reactor Multiblock work 2014-07-16 02:54:13 +01:00
Ben Spiers 445cb7a0a4 You are not using Wolfram|Alpha now, @unpairedbracket. 2014-07-16 02:54:13 +01:00
Ben Spiers bdde617489 More work on Fusion Reactor 2014-07-16 02:54:13 +01:00
Ben Spiers cb2188580e More Laser and Reactor work. Lasers work now, and Heat Generators generate energy from incident lasers, in order to test lasers. This is probably only temporary. 2014-07-16 02:54:13 +01:00
Aidan C. Brady cdeb25803c Started work on flamethrower sounds, also increased efficiency of SoundHandler (now loops over sounds only once instead of twice) 2014-07-15 01:09:38 -04:00
Aidan C. Brady f9fdb56e24 Fixed a few tiny laser compile issues 2014-07-14 17:23:42 -04:00
Aidan C. Brady a98bf8bba3 Merge branch 'development' into 1.8 2014-07-14 17:15:26 -04:00
Aidan C. Brady de1e264c68 Merge branch 'master' into development 2014-07-14 17:15:11 -04:00
Aidan C. Brady 146d974479 Fixed Teleporter localization, fixed balloons placing on non-solid sides, added AE processing recipes, improve tele porter efficiency 2014-07-14 17:14:32 -04:00
Ben Spiers c009940140 Fix Railcraft Dependency 
This is such a pain.
 2014-07-14 20:47:45 +01:00
Aidan C. Brady a24bd2e7ad A bit of work on teleporter localization. There's something weird going on, though. 2014-07-14 12:57:57 -04:00
Ben Spiers 8d36e9a152 Fix a bizarre bug I introduced ages ago. 2014-07-14 16:23:03 +01:00
Aidan C. Brady 23b6ce5105 Merge branch 'development' into 1.8 2014-07-13 23:52:29 -04:00