- a98bf8b Merge branch 'development' into 1.8 by Aidan C. Brady · 10 years ago
- de1e264 Merge branch 'master' into development by Aidan C. Brady · 10 years ago
- 146d974 Fixed Teleporter localization, fixed balloons placing on non-solid sides, added AE processing recipes, improve tele porter efficiency by Aidan C. Brady · 10 years ago
- c009940 Fix Railcraft Dependency by Ben Spiers · 10 years ago
- 249638e Fix somehow having 2 mcmod.info files in the Mekanism jar. by Ben Spiers · 10 years ago
- a24bd2e A bit of work on teleporter localization. There's something weird going on, though. by Aidan C. Brady · 10 years ago
- 8d36e9a Fix a bizarre bug I introduced ages ago. by Ben Spiers · 10 years ago
- 23b6ce5 Merge branch 'development' into 1.8 by Aidan C. Brady · 10 years ago
- 1094475 Fixed teleporter crash, fixed asset issue by Aidan C. Brady · 10 years ago
- ad0a71e Merge branch 'development' into 1.8 by Aidan C. Brady · 10 years ago
- 3fc1ec0 Merge branch 'development' of https://github.com/aidancbrady/Mekanism into development by Aidan C. Brady · 10 years ago
- 17f8fa1 Implemented robit crash fix by Aidan C. Brady · 10 years ago
- e466808 Merge pull request #1509 from Mierzen/development by Aidan · 10 years ago
- ddb6140 Merge branch '1.8' of https://github.com/aidancbrady/Mekanism into 1.8 by Aidan C. Brady · 10 years ago
- 9592d7f Flamethrower fixes! by Aidan C. Brady · 10 years ago
- 11e21e1 Start on implementation of lasers. by Ben Spiers · 10 years ago
- 24b15ee Missed one missing tooltip (haha) by Mierzen · 10 years ago
- 6fd1488 Language file changes: by Mierzen · 10 years ago
- 85455a0 Merge branch 'development' into 1.8 by Ben Spiers · 10 years ago
- 700cc76 Fix a different, unrelated OreDict issue. by Ben Spiers · 10 years ago
- 39c6b45 Fix Iron Dust smelting issue. Close #1478 by Ben Spiers · 10 years ago
- 3161e91 Update ru_RU.lang by Anton · 10 years ago
- c893a73 Update en_GB, add en_ZA by Mierzen · 10 years ago
- b650ed4 Revert "Capitalize some language keys (yes, no and AD modes)" by Mierzen · 10 years ago
- d8b9ff7 Merge branch 'master' into development by Ben Spiers · 10 years ago
- c560bdc Fix a different, unrelated OreDict issue. by Ben Spiers · 10 years ago
- 3e3bf2c Fix Iron Dust smelting issue. Close #1478 by Ben Spiers · 10 years ago
- 9c2582a Capitalize some language keys (yes, no and AD modes) by Mierzen · 10 years ago
- 7328fd4 Remove inherited language strings from en_GB and en_ZA by Mierzen · 10 years ago
- eecfd68 Merge pull request #1505 from Mierzen/master by Aidan · 10 years ago
- f92b682 Merge pull request #1506 from Adaptivity/patch-4 by Aidan · 10 years ago
- 1a45883 Work on making flamethrowers work nice. Still need to get first person neutral particles down. by Aidan C. Brady · 10 years ago
- afe69a0 Update ru_RU.lang by Anton · 10 years ago
- 0872cdb Update en_GB, add en_ZA by Mierzen · 10 years ago
- 6fbfd22 Merge branch 'development' into 1.8 by Aidan C. Brady · 10 years ago
- 4bea4c6 Remove stray @Method by Ben Spiers · 10 years ago
- 3f7de46 Just about polished off baby skeletons, started on getting the Flamethrower to render with correct scale and orientation by Aidan C. Brady · 10 years ago
- 6cc7efc Merge branch 'master' into 1.8 by Aidan C. Brady · 10 years ago
- c223eab Fixed Combiner NEI texture, fixed Cardboard Box not working by Aidan C. Brady · 10 years ago
- 6271284 Merge branch '1.8' of https://github.com/aidancbrady/Mekanism into 1.8 by Aidan C. Brady · 10 years ago
- 9abc111 Baby Skeletons, started work on Flamethrower by Aidan C. Brady · 10 years ago
- 0638cdb More work on Fusion Reactor and Lasers by Ben Spiers · 10 years ago
- cf6f5ab Bump versions to 8.0.0 by Aidan C. Brady · 10 years ago
- 246c942 Merge branch 'development' into 1.8 by Aidan C. Brady · 10 years ago
- cfdaf37 Moved MFR back into api package. by Aidan C. Brady · 10 years ago
- 0758ad7 Fix un-checked MFR API usage by Ben Spiers · 10 years ago
- 79f27e9 Merge branch 'master' of https://github.com/aidancbrady/Mekanism by Aidan C. Brady · 10 years ago
- 369eb01 Fixed Portable Tank transfer issue, fixed inventories not being sustained, fixed Logistical Transporter crash by Aidan C. Brady · 10 years ago
- a8bfe29 Depend on EnderIO and ExtraUtilities by Ben Spiers · 10 years ago
- f095cbd Fix the BuildCraft API dependency by Ben Spiers · 10 years ago
- 896dd4d Merge pull request #1483 from Mierzen/patch-2 by Aidan · 10 years ago
- 390f0b0 Force Mekanism to load after FMP by Aidan C. Brady · 10 years ago
- d72ce65 Updated Forge to 10.13.0.1180. by Aidan C. Brady · 10 years ago
- bba1358 Update README.md by Mierzen · 10 years ago
- ab0f002 Fixed FMP version! by Aidan C. Brady · 10 years ago
- 5bc7288 Mekanism v7...official release. by Aidan C. Brady · 10 years ago
- f597bce Updated Forge to 1179 by Aidan C. Brady · 10 years ago
- e3f8508 Merge branch 'development' into 1.8 by Ben Spiers · 10 years ago
- 4500232 More constants! by Ben Spiers · 10 years ago
- 6095f6e Fixed the evil mac sound bug by increasing the sampling rate and doubling the buffer size to two bytes. Also removed printlns. by Aidan C. Brady · 10 years ago
- 177372e Rewrote idle path calculations of Logistical Transporters! by Aidan C. Brady · 10 years ago
- 4ba9afb 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. by Aidan C. Brady · 10 years ago
- ee00c5a Chemical Dissolution Chamber now can accept upgrades by Aidan C. Brady · 10 years ago
- 60b2266 Fixes galore! by Aidan C. Brady · 10 years ago
- eda233f More GUI bugs! by Aidan C. Brady · 10 years ago
- 77d3469 Fix a few GUI bugs by Aidan C. Brady · 10 years ago
- 171c976 Chemical Crystallizer now accepts upgrades by Aidan C. Brady · 10 years ago
- 65a8633 Gave Chemical Oxidizer and PRC upgrade systems, fixed Chemical Oxidizer and Electrolytic Separator NEI modules by Aidan C. Brady · 10 years ago
- 7198704 Fixed a crash! by Aidan C. Brady · 10 years ago
- fc87866 Implemented new container edit modes in Portable Tank and Dynamic Tank, still need to set up IFluidContainerItem integration with the Dynamic Tank by Aidan C. Brady · 10 years ago
- 12f3ef8 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. by Aidan C. Brady · 10 years ago
- 16c5f7c Merge branch 'development' of https://github.com/aidancbrady/Mekanism into development by Aidan C. Brady · 10 years ago
- 1f9782d Added logic to allow fluid-accepting machines to use IFluidContainerItem fluids by Aidan C. Brady · 10 years ago
- a643f1c Start on Fusion Reactor logic and infrastructure. Currently experimenting with parameters for balance. by Ben Spiers · 10 years ago
- 55b178b Revert "Start on Fusion Reactor logic and infrastructure. Currently experimenting with parameters for balance." by Ben Spiers · 10 years ago
- 95b6ac8 Merge branch 'development' of https://github.com/aidancbrady/Mekanism into development by Aidan C. Brady · 10 years ago
- fc138c5 Portable Tank now serves as a FluidContainerItem, now I just need to get fluid-accepting machines to recognize them by Aidan C. Brady · 10 years ago
- 7394ced Start on Fusion Reactor logic and infrastructure. Currently experimenting with parameters for balance. by Ben Spiers · 10 years ago
- cd10bc8 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. by Ben Spiers · 10 years ago
- 5e0dc25 Update BC and IC2 APIs. Not updated Mek code to match yet. by Ben Spiers · 10 years ago
- 9dc1c1d 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. by Aidan C. Brady · 10 years ago
- 23adf9a 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. by Aidan C. Brady · 10 years ago
- 63970a2 Upgraded gas item recipe integration greatly, should make things much smoother. by Aidan C. Brady · 10 years ago
- 377fff3 We don't really need getLocation(), instead using Coord4D.get() with the getTile() method. by Aidan C. Brady · 10 years ago
- ee87d8c Transmitter code cleanup - killed the now-unused merge() method and separated data handlers from ITransmitterNetwork itself. Also added new pipe textures. by Aidan C. Brady · 10 years ago
- f405a9e Fixed transmitter recipes to more reasonable options. by Aidan C. Brady · 10 years ago
- df31833 Tiny cleanup by Aidan C. Brady · 10 years ago
- 4e32a77 Fix Client/Server issues. by Ben Spiers · 10 years ago
- 83ff761 Fix a bug with takeTopItem() inventory management. This fixed it, @ErogenousBeef! by Aidan C. Brady · 10 years ago
- f26c49d Add a mcmod.info for development purposes. by Ben Spiers · 10 years ago
- df58560 Clean up configs a lot; Fix Config GUIs. This will require people to sort out their configs on their own, as things have moved. by Ben Spiers · 10 years ago
- f67be01 Tank-based fluid container interaction fixes. Can't figure out the data request issue. by Aidan C. Brady · 10 years ago
- 8a8086a Merge branch '1.7.10' into development by Ben Spiers · 10 years ago
- f0ad905 Merge branch '1.7.10' into development by Ben Spiers · 10 years ago
- 964a268 Update FMP, add MC version to version string and make my home-built jars not be 7.0.0.null any more. Also because I needed to use the elvis operator (?:) after learning of the existence of the elvis operator. by Ben Spiers · 10 years ago
- 3b32d5a Update forge by Ben Spiers · 10 years ago
- 786d399 Require Forge 10.12.2.1147 or above. by Ben Spiers · 10 years ago
- 9562f53 Bump versions of new CCLib and FMP by Aidan C. Brady · 10 years ago
- 1914910 Merge pull request #1435 from BrunoLG/patch-3 by Aidan · 10 years ago
- 5e08f81 We can depend on APIs directly now :) by Ben Spiers · 10 years ago