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 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
Aidan C. Brady 1094475344 Fixed teleporter crash, fixed asset issue 2014-07-13 23:52:17 -04:00
Aidan C. Brady ad0a71ee71 Merge branch 'development' into 1.8 2014-07-13 23:34:28 -04:00
Aidan C. Brady 3fc1ec00e9 Merge branch 'development' of https://github.com/aidancbrady/Mekanism into development 2014-07-13 23:34:13 -04:00
Aidan C. Brady 17f8fa11da Implemented robit crash fix 2014-07-13 23:34:01 -04:00
Aidan e466808a22 Merge pull request #1509 from Mierzen/development 
Lang file changes
 2014-07-13 23:31:10 -04:00
Aidan C. Brady ddb6140513 Merge branch '1.8' of https://github.com/aidancbrady/Mekanism into 1.8 2014-07-13 23:27:28 -04:00
Aidan C. Brady 9592d7f024 Flamethrower fixes! 2014-07-13 23:27:23 -04:00
Ben Spiers 11e21e1957 Start on implementation of lasers. 2014-07-14 01:34:26 +01:00
Mierzen 24b15ee90f Missed one missing tooltip (haha) 2014-07-13 22:16:46 +02:00
Mierzen 6fd14886c0 Language file changes: 
Add missing tooltips! (Chemical oxidizer and infuser), please check!
Change "Round robin" to "Round-robin"
Make tooltips more 'square'
 2014-07-13 21:54:47 +02:00
Ben Spiers 700cc76c35 Fix a different, unrelated OreDict issue. 2014-07-13 19:58:00 +01:00
Ben Spiers 39c6b45a2c Fix Iron Dust smelting issue. Close #1478 2014-07-13 19:58:00 +01:00
Anton 3161e916d7 Update ru_RU.lang 2014-07-13 19:58:00 +01:00
Mierzen c893a73490 Update en_GB, add en_ZA 2014-07-13 19:57:59 +01:00
Mierzen b650ed463d Revert "Capitalize some language keys (yes, no and AD modes)" 
This reverts commit 9c2582a26e.
 2014-07-13 20:56:33 +02:00
Ben Spiers d8b9ff7a20 Merge branch 'master' into development 2014-07-13 19:56:28 +01:00
Ben Spiers c560bdc2e1 Fix a different, unrelated OreDict issue. 2014-07-13 19:53:41 +01:00
Ben Spiers 3e3bf2c25c Fix Iron Dust smelting issue. Close #1478 2014-07-13 19:53:41 +01:00
Mierzen 9c2582a26e Capitalize some language keys (yes, no and AD modes) 2014-07-13 20:21:11 +02:00
Mierzen 7328fd4400 Remove inherited language strings from en_GB and en_ZA 2014-07-13 20:19:08 +02:00
Aidan eecfd68798 Merge pull request #1505 from Mierzen/master 
Update en_GB, add en_ZA
 2014-07-13 13:34:39 -04:00
Aidan C. Brady 1a458834a8 Work on making flamethrowers work nice. Still need to get first person neutral particles down. 2014-07-13 13:32:28 -04:00
Anton afe69a0f9f Update ru_RU.lang 2014-07-13 18:41:16 +04:00
Mierzen 0872cdbf04 Update en_GB, add en_ZA 2014-07-13 13:11:00 +02:00
Aidan C. Brady 6fbfd22583 Merge branch 'development' into 1.8 2014-07-13 00:16:05 -04:00
Ben Spiers 4bea4c62fd Remove stray @Method 
Should fix #1500
 2014-07-13 05:06:57 +01:00
Aidan C. Brady 3f7de46991 Just about polished off baby skeletons, started on getting the Flamethrower to render with correct scale and orientation 2014-07-12 23:59:39 -04:00
Aidan C. Brady 6cc7efc64b Merge branch 'master' into 1.8 2014-07-12 22:53:21 -04:00
Aidan C. Brady c223eabb95 Fixed Combiner NEI texture, fixed Cardboard Box not working 2014-07-12 22:52:13 -04:00
Aidan C. Brady 6271284436 Merge branch '1.8' of https://github.com/aidancbrady/Mekanism into 1.8 2014-07-12 22:35:04 -04:00
Aidan C. Brady 9abc111ecd Baby Skeletons, started work on Flamethrower 2014-07-12 22:34:58 -04:00
Ben Spiers 0638cdb61c More work on Fusion Reactor and Lasers 2014-07-13 02:46:47 +01:00
Aidan C. Brady cf6f5ab387 Bump versions to 8.0.0 2014-07-12 18:52:46 -04:00
Aidan C. Brady 246c9426be Merge branch 'development' into 1.8 2014-07-12 18:50:05 -04:00
Aidan C. Brady cfdaf37e4b Moved MFR back into api package. 2014-07-12 16:10:10 -04:00
Ben Spiers 0758ad752b Fix un-checked MFR API usage 2014-07-12 21:04:33 +01:00
Aidan C. Brady 79f27e9d11 Merge branch 'master' of https://github.com/aidancbrady/Mekanism 2014-07-12 16:02:32 -04:00
Aidan C. Brady 369eb012af Fixed Portable Tank transfer issue, fixed inventories not being sustained, fixed Logistical Transporter crash 2014-07-12 16:02:21 -04:00
Ben Spiers a8bfe29c8e Depend on EnderIO and ExtraUtilities 
If this doesn't fix it I don't know what will
 2014-07-12 19:03:17 +01:00
Ben Spiers f095cbd3fd Fix the BuildCraft API dependency 
Hopefully fix some issues.
 2014-07-12 18:46:43 +01:00
Aidan C. Brady 390f0b06bc Force Mekanism to load after FMP 2014-07-12 12:59:44 -04:00
Aidan C. Brady 5bc7288bc2 Mekanism v7...official release. 2014-07-12 00:05:19 -04:00
Ben Spiers e3f8508527 Merge branch 'development' into 1.8 2014-07-12 01:56:13 +01:00
Ben Spiers 4500232762 More constants! 
Refine constants based on findings of experimentation with the Sage simulator I wrote (here: https://gist.github.com/unpairedbracket/43ee788498dd5dcd1011)
 2014-07-12 01:54:53 +01:00
Aidan C. Brady 6095f6e062 Fixed the evil mac sound bug by increasing the sampling rate and doubling the buffer size to two bytes. Also removed printlns. 2014-07-11 16:07:58 -04:00
Aidan C. Brady 177372e9fe Rewrote idle path calculations of Logistical Transporters! 
Firstly, stacks will no longer will remember their home locations after a single failed home routing calculation.  More importantly, instead of recursively pathfinding the furthest transporter from a stack's current location, the stack will randomly select a direction to start traveling. Once it reaches the end of a line of transporters, it will attempt to recalculate a path to an inventory.  If it is unsuccessful, it will simply pick another direction to start traveling and the process will repeat.  This keeps the previous behavior, but does it much less CPU-intensively.
 2014-07-11 14:52:55 -04:00
Aidan C. Brady 4ba9afb369 Updated recipes to be more consistent. This was about all I wanted to accomplish for v7...either I make Gas Cells tomorrow or I push the release. 2014-07-11 01:45:44 -04:00
Aidan C. Brady ee00c5a22b Chemical Dissolution Chamber now can accept upgrades 2014-07-11 00:42:06 -04:00
Aidan C. Brady 60b226600f Fixes galore! 2014-07-11 00:34:05 -04:00
Aidan C. Brady eda233f1cf More GUI bugs! 2014-07-10 23:12:19 -04:00
Aidan C. Brady 77d3469f61 Fix a few GUI bugs 2014-07-10 23:06:35 -04:00
Aidan C. Brady 171c9767e0 Chemical Crystallizer now accepts upgrades 2014-07-10 22:40:20 -04:00
Aidan C. Brady 65a8633441 Gave Chemical Oxidizer and PRC upgrade systems, fixed Chemical Oxidizer and Electrolytic Separator NEI modules 2014-07-10 22:28:04 -04:00
Aidan C. Brady 7198704363 Fixed a crash! 2014-07-10 18:13:56 -04:00
Aidan C. Brady fc878661d5 Implemented new container edit modes in Portable Tank and Dynamic Tank, still need to set up IFluidContainerItem integration with the Dynamic Tank 2014-07-10 18:08:53 -04:00
Aidan C. Brady 12f3ef8665 Lay out the foundation for container edit modes. Also changed the way Dynamic Tank caches work - they are now much more modular and will remember their multiblock inventories on world reload. 2014-07-10 17:51:26 -04:00
Aidan C. Brady 16c5f7cdb3 Merge branch 'development' of https://github.com/aidancbrady/Mekanism into development 2014-07-10 16:25:04 -04:00
Aidan C. Brady 1f9782d1c7 Added logic to allow fluid-accepting machines to use IFluidContainerItem fluids 2014-07-10 16:24:55 -04:00
Ben Spiers a643f1c35c Start on Fusion Reactor logic and infrastructure. Currently experimenting with parameters for balance. 2014-07-10 19:24:33 +01:00
Ben Spiers 55b178b907 Revert "Start on Fusion Reactor logic and infrastructure. Currently experimenting with parameters for balance." 
This reverts commit 7394ceda8f.
 2014-07-10 19:22:54 +01:00
Aidan C. Brady 95b6ac8be1 Merge branch 'development' of https://github.com/aidancbrady/Mekanism into development 2014-07-10 13:35:37 -04:00
Aidan C. Brady fc138c57c2 Portable Tank now serves as a FluidContainerItem, now I just need to get fluid-accepting machines to recognize them 2014-07-10 13:30:58 -04:00
Ben Spiers 7394ceda8f Start on Fusion Reactor logic and infrastructure. Currently experimenting with parameters for balance. 2014-07-10 16:53:01 +01:00
Ben Spiers cd10bc88c8 Updates for changed IC2 API. Not sure if I'll be able to use @Optional with the new non-legacy BC MJ API as it uses Annotations instead of interfaces. 2014-07-10 16:53:01 +01:00
Aidan C. Brady 9dc1c1d1c6 Work on a more consistent tier system. Added Reinforced Alloy, renamed Atomic Core to Atomic Alloy, and changed the recipe of the Atomic Alloy to use multiple levels of Metallurgic Infuser processing. The Reinforced Alloy is in between. 2014-07-09 23:52:01 -04:00
Aidan C. Brady 23adf9ad24 Added Salt Blocks - generates similarly to clay. Added tooltips for config GUI. Added option to regenerate ores, as this is now a thing. Also...began implementing different tiers of control circuits. 2014-07-09 22:06:36 -04:00
Aidan C. Brady 63970a29ea Upgraded gas item recipe integration greatly, should make things much smoother. 2014-07-09 17:05:33 -04:00
Aidan C. Brady 377fff30ca We don't really need getLocation(), instead using Coord4D.get() with the getTile() method. 2014-07-09 15:37:43 -04:00
Aidan C. Brady ee87d8cef5 Transmitter code cleanup - killed the now-unused merge() method and separated data handlers from ITransmitterNetwork itself. Also added new pipe textures. 2014-07-09 15:31:57 -04:00
Aidan C. Brady f405a9e2f0 Fixed transmitter recipes to more reasonable options. 2014-07-09 02:15:28 -04:00
Aidan C. Brady df31833cb6 Tiny cleanup 2014-07-08 14:13:29 -04:00
Ben Spiers 4e32a77ac8 Fix Client/Server issues. 2014-07-07 23:33:48 +01:00
Aidan C. Brady 83ff761ec4 Fix a bug with takeTopItem() inventory management. This fixed it, @ErogenousBeef! 2014-07-07 18:21:22 -04:00
Ben Spiers f26c49d6b4 Add a mcmod.info for development purposes. 2014-07-07 21:23:04 +01:00
Ben Spiers df58560729 Clean up configs a lot; Fix Config GUIs. This will require people to sort out their configs on their own, as things have moved. 2014-07-07 21:23:04 +01:00
Aidan C. Brady f67be01658 Tank-based fluid container interaction fixes. Can't figure out the data request issue. 2014-07-07 15:54:26 -04:00
Ben Spiers 8a8086af3f Merge branch '1.7.10' into development 2014-07-07 15:45:33 +01:00
Ben Spiers f0ad905c07 Merge branch '1.7.10' into development 
Conflicts:
	build.properties
	src/main/java/mekanism/common/Mekanism.java
	src/main/java/mekanism/common/voice/VoiceConnection.java
 2014-07-07 15:43:53 +01:00
Ben Spiers 786d399c2c Require Forge 10.12.2.1147 or above. 2014-07-05 14:39:25 +01:00
Aidan 1914910c78 Merge pull request #1435 from BrunoLG/patch-3 
Update pt_BR.lang
 2014-07-02 18:39:39 -04:00
Ben Spiers 5e08f8110a We can depend on APIs directly now :) 2014-06-27 20:00:10 +01:00
Ben Spiers 589d5f420f Recommit update changes that were seemingly lost in a rebase-pull. 2014-06-27 20:00:10 +01:00
Ben Spiers 55f8dbfbad PacketDataRequest.onMessage is being called on the client side in SSP. Stop that from crashing the client, but is it a problem that it's being called at all? 2014-06-27 20:00:10 +01:00
Ben Spiers 9383ea24b6 Add dependencies to stop some crashes. 2014-06-27 20:00:09 +01:00
Dashkal 84bed9b2b1 Port to forge-10.12.2.1121 (was 10.12.1.1112) 
* Updated build.properties
 * Now using the new OreDictionary.getoreIDs() call to obtain oreDict names
 * No longer modifying OreDictionary collections in ChemicalInjectionRecipeHandler
 * No longer registering list redstone under oreRedstone (causes an NPE)
 2014-06-27 20:00:09 +01:00
Aidan C. Brady 5397de0bfa Added a crafting recipe for rails using osmium. Thanks, casilleroatr 2014-06-27 20:00:09 +01:00
Aidan C. Brady 205a6feab5 Revert "Update to 1.7.10. Thanks for getting the API stuff set up, @unpairedbracket, I'm using Forge 1152 now." 
This reverts commit 604f138f71.
 2014-06-27 20:00:09 +01:00
Ben Spiers 1f12d2a91d PacketDataRequest.onMessage is being called on the client side in SSP. Stop that from crashing the client, but is it a problem that it's being called at all? 2014-06-27 16:20:02 +01:00
Ben Spiers 3616d19147 Add dependencies to stop some crashes. 2014-06-27 16:20:02 +01:00
Dashkal 9b3ee926e2 Port to forge-10.12.2.1121 (was 10.12.1.1112) 
* Updated build.properties
 * Now using the new OreDictionary.getoreIDs() call to obtain oreDict names
 * No longer modifying OreDictionary collections in ChemicalInjectionRecipeHandler
 * No longer registering list redstone under oreRedstone (causes an NPE)
 2014-06-27 16:20:02 +01:00
Aidan C. Brady de6d418697 Added a crafting recipe for rails using osmium. Thanks, casilleroatr 2014-06-27 10:56:56 -04:00
Aidan C. Brady 3b5438a064 Merge branch 'master' into 1.7.10 
Conflicts:
	common/mekanism/common/PacketHandler.java
 2014-06-26 23:47:43 -04:00
Aidan C. Brady 7ca2090bc7 Revert "Update to 1.7.10. Thanks for getting the API stuff set up, @unpairedbracket, I'm using Forge 1152 now." 
This reverts commit 604f138f71.
 2014-06-26 23:43:35 -04:00
Aidan C. Brady 604f138f71 Update to 1.7.10. Thanks for getting the API stuff set up, @unpairedbracket, I'm using Forge 1152 now. 2014-06-26 23:40:02 -04:00
Ben Spiers 4d0f276e55 Fix a server crash relating to a client-side only class initialization (credit to @kosakriszi). Closes #1442. 2014-06-27 03:25:47 +01:00
Ben Spiers ff1b3b792e Config GUIs are cool. 2014-06-27 03:22:46 +01:00
Ben Spiers ac223c8df5 Fix ic2 pulling and IConfigurable passthrough (leaving the OreDict fix for the Pull Request). getConnectedOutputters was broken. 2014-06-26 23:47:33 +01:00
Ben Spiers 3a027d0ef4 Aaaaaaand ComputerCraft. 2014-06-26 21:07:46 +01:00
Ben Spiers f463416c0c Metallurgy was easier than expected. 2014-06-26 20:18:03 +01:00
Ben Spiers 26463711de Galacticraft and MFR API Optional-ing 2014-06-26 20:17:45 +01:00
Ben Spiers 8ddda5d0dc BuildCraft now also working without shipping API 2014-06-26 19:28:40 +01:00
Ben Spiers 611d4c8f52 Got some IC2 stuff working now. Turns out I was being stupid. 2014-06-26 18:18:18 +01:00
Aidan C. Brady ab07313573 Merge branch 'development' of https://github.com/aidancbrady/Mekanism into development 2014-06-26 01:20:15 -04:00
Aidan C. Brady bc3636aaec Quick cleanup 2014-06-26 01:20:09 -04:00
Ben Spiers 9c58ed549f Start of work on Doing It Right™. Appears to work for cofh's API, not yet for IC2 or BC. Not sure why. Might have to ask @cpw. 2014-06-26 01:10:53 +01:00
Ben Spiers 82a708c7b2 Remove bits of APIs that are unneeded. First step in attempting to Do It Right™ 2014-06-24 20:33:25 +01:00
BrunoLG 9feb98953a Update pt_BR.lang 2014-06-24 15:51:27 -03:00
Aidan C. Brady d5812b63ec Merge branch 'development' of https://github.com/aidancbrady/Mekanism into development 2014-06-22 13:39:49 -04:00
Aidan C. Brady 576470784b Fix OreDict registration typo 2014-06-22 08:48:16 -04:00
Anton 1252cf7c80 Update ru_RU.lang 2014-06-21 22:07:56 +04:00
Aidan C. Brady 59df1b5c8f Properly load MekanismTools configuration 2014-06-21 11:57:08 -04:00
Aidan C. Brady b3a3dbb827 Corrected that fix! 2014-06-21 00:34:09 +02:00
Aidan C. Brady 62e14b3a2e Fixed loop with Portable Tank push 2014-06-21 00:31:44 +02:00
Aidan C. Brady b7a142ba6b Fluidic Plenisher model! 2014-06-20 20:13:20 +02:00
Aidan C. Brady efc72769d6 Fix offsets, implement some of @tterrag1098's changes 2014-06-19 20:47:45 +02:00
Aidan C. Brady 098a74600c Fixed PRC NEI issue, fixed bucket not sustaining inventory, fixed a few other things 2014-06-19 20:33:10 +02:00
Aidan 28766f0da3 Merge pull request #1425 from dschub/oredict-fmp 
Fix crash when mining BlockMultipart with Atomic Disassembler
 2014-06-19 14:03:23 -04:00
Aidan C. Brady cf1469c7da Fix weird blending issue with Dynamic Glass, gave Seismic Vibrator an on texture 2014-06-19 15:44:08 +02:00
Aidan C. Brady 99c1f44db5 Fixed refs to refresh() method 2014-06-19 15:18:41 +02:00
Aidan C. Brady e2dd5a09cb You can now push fluids in through the bottom of a Portable Tank, and it will route to the first empty tank above! 2014-06-19 14:58:23 +02:00
Aidan C. Brady 27295670cc Whoops - fixed crash. Also added recipe for Plenisher. 2014-06-19 14:42:11 +02:00
Aidan C. Brady d9658a16bd Transmitter network efficiency overhaul! Transmitter networks now only refresh acceptors on the transmitter that initiated the refresh instead of resetting the entire grid. 2014-06-19 14:34:57 +02:00
Aidan C. Brady fba83a3634 Fluidic Plenisher work - just about done! 2014-06-19 13:57:30 +02:00
Daniel Schubert df8d651c5d Fix crash when mining BlockMultipart with Atomic Disassembler 2014-06-19 13:33:23 +02:00
Aidan C. Brady 90da466ca1 Started work on Fluidic Plenisher 2014-06-19 12:42:59 +02:00
Aidan C. Brady 55937cd7d4 Portable Tanks are polished as far as I can see! Also added a few missing localizations. 2014-06-19 02:34:49 +02:00
Aidan C. Brady d7b0899f38 Fixed glowing tanks, fixed blend screwup when in toolbar, quick cleanup 2014-06-19 01:41:07 +02:00
Aidan C. Brady 7924531a4e Dispensers can now latch balloons onto nearby entities, also working Portable Tank GUI 2014-06-19 01:13:23 +02:00
Aidan C. Brady 5852b59b50 Merge branch 'development' of https://github.com/aidancbrady/Mekanism into development 2014-06-18 21:19:13 +02:00
Aidan C. Brady 77207ceab1 A few GUI fixes 2014-06-18 21:18:45 +02:00
Aidan a350b69f62 Merge pull request #1418 from dschub/armor-render 
Fix armor rendering
 2014-06-18 15:05:52 -04:00
Aidan C. Brady a3784d1fe7 More portable tank work, mainly on GUIs 2014-06-18 21:05:32 +02:00
Daniel Schubert 61f914e2cf Smooth rendering of Wind Turbine 2014-06-18 20:07:27 +02:00
Aidan C. Brady adc8a9bc23 Portable Buckets...a lot more work than I thought 2014-06-18 19:42:57 +02:00
Daniel Schubert b390808a76 Fix armor rendering 2014-06-18 14:13:07 +02:00
Aidan C. Brady fd74ee5c92 Started work on Portable Tank 2014-06-18 03:01:23 +02:00
Aidan C. Brady ead4af2f78 Fixed transporter item rendering, fixed WAILA display bug. Dispensers now eject balloon entities! 2014-06-17 18:21:59 +02:00
Aidan C. Brady 0528f1aace Fix NEI offset for PRC, gave PRC a model, added specific sides for machines 2014-06-17 01:52:59 +02:00
Daniel Schubert 356367a09b Fix Logistical Sorter auto-eject coloring 2014-06-16 10:00:15 +02:00
Aidan C. Brady 1e643a9d6f Fixed Jetpack key bindings (also fixed crash) 2014-06-16 02:44:33 +02:00
Aidan C. Brady fbbea1b2c9 Key bindings no longer crash, added PRC sound effect 2014-06-16 02:31:45 +02:00
Aidan C. Brady 5fd89a7959 Added recipe for PRC, energy type is now controlled by server (closes #1369) 2014-06-16 02:09:31 +02:00
Aidan C. Brady 75f09adba2 Seismic Vibrator model 2014-06-16 01:50:40 +02:00
Ben Spiers 2663be0f5a Allow Glow panels to be placed and stay in hollow covers again. 2014-06-15 20:26:47 +01:00
Aidan C. Brady 366a51e770 Crash fix! 2014-06-15 19:12:50 +02:00
Ben Spiers ac6ee8514f Quickly prevent NPEs in machines with empty tanks 2014-06-15 16:28:16 +01:00
Aidan C. Brady 982c7427f3 Fix cable dupe 2014-06-15 14:16:57 +02:00
Aidan C. Brady 4fdae8cbef Cherrypicked @dschub's vein fix - thanks! 2014-06-15 13:40:06 +02:00
Aidan C. Brady 90c1c690a9 Updated Cofh API 2014-06-15 13:35:51 +02:00
Aidan C. Brady 6cd3ae4fea Updated IC2 API, fixed paxels 2014-06-15 13:29:59 +02:00
Aidan C. Brady f2b914e216 Loads of GUI/NEI work. Tomorrow I need to get overlays to render on GuiElement slots 2014-06-15 02:22:55 +02:00
Aidan C. Brady 3a81058cbd Fix more transmitter render issues, also started on PRC NEI module 2014-06-14 19:31:24 +02:00
Aidan C. Brady 5c36612146 Updated NEI module to reflect new GUI changes, added PRC to RecipeHelper 2014-06-14 18:33:48 +02:00
Aidan C. Brady 3b99d376a4 Work on NEI module 2014-06-14 14:33:02 +02:00
Aidan C. Brady a40ab961c6 Added OreDict-based dye recipes, fixed MekanismTools item positioning 2014-06-14 14:16:33 +02:00
Aidan C. Brady 6ede9308e8 A few small fixes 2014-06-14 13:49:47 +02:00
Aidan C. Brady 9dea537010 Whoops - added indexed click impl 2014-06-14 10:30:58 +02:00
Aidan C. Brady 31dd643259 Add necessary GUI implementation for new mod ID filters 2014-06-14 10:26:12 +02:00
Aidan C. Brady 1a0821c727 Found work-around for javac issue - need to remember to submit an issue to oracle tomorrow 2014-06-14 01:35:25 +02:00
Aidan C. Brady 70abe40b1f Mod ID filters :) 2014-06-13 20:58:50 +02:00
Anton 0b3244c4f1 Update ru_RU.lang 2014-06-13 11:32:19 +04:00
Aidan C. Brady 517c2a7655 Re-added NEI 2014-06-13 00:26:07 +02:00
Aidan C. Brady c8fb800c1a Updated localization yet again, fixed a small bug 2014-06-13 00:16:02 +02:00
Aidan C. Brady ef7f6e91eb Glow panels now break off of non-solid surfaces 2014-06-12 23:36:29 +02:00
Aidan C. Brady 81477966ee Fix all render issues. 1.7 is now officially more stable than 1.6 (but not stable enough) 2014-06-12 18:16:20 +02:00
Aidan 9ae7cc0483 Merge pull request #1398 from Adaptivity/patch-3 
Update en_US.lang
 2014-06-11 11:59:10 +02:00
Aidan C. Brady e5f76907ce Rewrite networking code for the 100th time to fix memory leak 2014-06-11 11:57:49 +02:00
Anton 2b9735d84c Update en_US.lang 
Correct few derps
 2014-06-10 16:49:19 +04:00
Aidan C. Brady be3883195c Glow panels render, but are really screwed up 2014-06-10 14:09:47 +02:00
Aidan C. Brady f3894f220c Added repair capabilities to armor and tools 2014-06-10 13:25:12 +02:00
Aidan C. Brady 3992a6ae46 Several more fixes! 2014-06-10 12:56:02 +02:00
Aidan C. Brady 49c7b1062a Improved gas handling, fixed ignoring "NONE" connection. Also got common-side tick handlers up and running again 2014-06-10 12:49:49 +02:00
Aidan C. Brady 8685664d51 Added Electric Pump energy usage config value, also fixed a few bugs with the new Gas-Burning Generator 2014-06-10 12:24:44 +02:00
Aidan C. Brady d7fdc3a243 Greatly improved localization 2014-06-10 11:35:54 +02:00
Aidan C. Brady c875dab552 Updated recipes 2014-06-09 17:15:34 +02:00
Aidan C. Brady 7c7e5e23ee Update box blacklist to parse with block name instead of ID 2014-06-09 17:05:57 +02:00
Aidan C. Brady d6d7000eaf Update PacketPipeline to reflect new 6.0.5 transmitter packet changes 2014-06-09 16:52:29 +02:00
Aidan C. Brady dd83381774 Bug fixes! 2014-06-09 16:19:36 +02:00
Aidan C. Brady 726d9ebb0a Atomic Disassembler now can cut down trees with vein mode 2014-06-09 15:57:38 +02:00
Aidan C. Brady 85f31fb9d1 Merge branch 'development' of https://github.com/aidancbrady/Mekanism into development 2014-06-09 15:29:41 +02:00
Aidan C. Brady 4334690f78 Improved localization 2014-06-09 15:29:00 +02:00
Anton dd1ea7fc3e Update de_DE.lang 2014-06-09 09:40:28 +04:00
Anton 0cbbc5e29b Update en_US.lang 2014-06-09 09:40:04 +04:00
Anton f55965f53b Update fr_FR.lang 2014-06-09 09:39:19 +04:00
Anton f7c89dcd75 Update pl_PL.lang 2014-06-09 09:38:14 +04:00
Anton e806004db7 Update pt_BR.lang 2014-06-09 09:37:44 +04:00
Anton 38b6765292 Update zh_CN.lang 2014-06-09 09:37:08 +04:00
Anton 60eb2944f7 Update zh_TW.lang 2014-06-09 09:35:49 +04:00
Anton 68c64cf44d Update ru_RU.lang 
DON'T MERGE YET
 2014-06-09 09:34:57 +04:00
Aidan C. Brady 75bd49de9d Buffed Salination Plant's water usage 2014-06-08 17:39:57 +02:00
Aidan C. Brady d436c70421 Merge branch 'master' into development 
Conflicts:
	build.gradle
	build.properties
	common/mekanism/common/network/PacketPortableTeleport.java
	common/mekanism/tools/common/MekanismTools.java
	etc/core/mcmod.info
	etc/generators/mcmod.info
	etc/tools/mcmod.info
	src/main/java/mekanism/common/EnergyNetwork.java
	src/main/java/mekanism/common/Mekanism.java
	src/main/java/mekanism/common/PacketHandler.java
	src/main/java/mekanism/common/network/PacketTransmitterUpdate.java
	src/main/java/mekanism/common/tile/TileEntityChargepad.java
	src/main/java/mekanism/common/tile/TileEntityEnergyCube.java
	src/main/java/mekanism/common/tile/TileEntityLogisticalSorter.java
	src/main/java/mekanism/generators/common/MekanismGenerators.java
 2014-06-08 12:01:08 +02:00
Aidan C. Brady c72e1c6efc Work on transmitters 2014-06-08 01:17:47 +02:00
Aidan C. Brady b387c8529d Bumped version to 7.0.0, a few fixes and enhancements 2014-06-06 00:16:36 +02:00
Aidan C. Brady d1c3b3b8ef Manually merged riches' PR 2014-06-04 11:05:29 +02:00
Aidan C. Brady a973ef118c Merge branch 'development' of https://github.com/aidancbrady/Mekanism into development 2014-06-04 03:07:23 +02:00
Aidan C. Brady 1137b9514a Quick fix for Tellurium 2014-06-04 03:07:08 +02:00
Aidan 96a52dd606 Merge pull request #1373 from Vexatos/patch-2 
Update de_DE.lang
 2014-06-04 03:02:19 +02:00
Aidan C. Brady 91cd34b7d3 Harvest levels! Yeah! 2014-06-04 02:57:33 +02:00
Aidan C. Brady bda4f8cfe5 Fixed Walkie Talkies 2014-06-04 02:38:39 +02:00
Aidan C. Brady f0d3848f8a Sounds work! Also got tick handlers set up, still have to do a few things 2014-06-03 20:57:59 +02:00