- 285423d Merge branch 'development' into 1.8 by Aidan Brady · 10 years ago
- 4a70449 Merge branch 'master' into development by Aidan Brady · 10 years ago
- 56e6cbc Merge pull request #1590 from Tonius/patch-1 by Aidan · 10 years ago
- 057c4d0 Merge pull request #1596 from mymagadsl/patch-3 by Aidan · 10 years ago
- 5f83a42 Make some textures more transparent to get a better look at the fusion plasma. by Ben Spiers · 10 years ago
- a6ff475 Fusion reactor NBT save/load, and a first attempt at plasma render. Fusion reactor is basically finished at this point. by Ben Spiers · 10 years ago
- d7c060d Update BC API and fix up EnergyNet and CableUtils to work with the new MjAPI by Ben Spiers · 10 years ago
- d832119 Oops by Ben Spiers · 10 years ago
- 4faa733 Merge branch 'development' into 1.8 by Ben Spiers · 10 years ago
- 59dab7c Move StackUtil to api package for not causing errors. by Ben Spiers · 10 years ago
- 1b54cfb More laser amplifier changes by Ben Spiers · 10 years ago
- d4f05c8 Some cleanup of MekanismUtils and more EnergyDisplay changes to use our energy units. by Ben Spiers · 10 years ago
- 26bc15a Adding Lit Redstone Ore to OreDict is well and truly broken. by Ben Spiers · 10 years ago
- b62c5c8 Get basic functionality working for the Laser Amplifier. No mode changing yet, and using the laser model in lieu of the actual one. by Ben Spiers · 10 years ago
- bfe3b54 Merge branch 'development' into 1.8 by Ben Spiers · 10 years ago
- 78addc3 Stop a potential NPE in Gas Gauges. by Ben Spiers · 10 years ago
- 2b7300b Stop a potential NPE in Gas Gauges. by Ben Spiers · 10 years ago
- cf53322 Update zh_TW.lang by mymagadsl · 10 years ago
- 6f4e0da Fix a small advanced solar placement bug. by Ben Spiers · 10 years ago
- 9413950 Merge branch 'development' into 1.8 by Ben Spiers · 10 years ago
- c339ee7 Merge branch 'master' into development by Ben Spiers · 10 years ago
- c974646 Fix trying to use IC2 EnergyNet without IC2 installed. It would never work anyway. by Ben Spiers · 10 years ago
- 1d52a4f Add a Creative Energy Cube that's always half-full so it can sink or provide arbitrary amounts of energy. by Ben Spiers · 10 years ago
- 38b5542 Add tabs to Fuel and Heat GUIs to get to the other one. by Ben Spiers · 10 years ago
- f21568d Textures for Fusion Fluids by Ben Spiers · 10 years ago
- cf4df09 Fix a crash casting null to float by Ben Spiers · 10 years ago
- 5dcd9ab Add an injection rate text field by Ben Spiers · 10 years ago
- 9696ad2 Merge branch '1.8' of https://github.com/aidancbrady/Mekanism into 1.8 by Aidan Brady · 10 years ago
- 1ad7fe8 Salination Plant now auto-forms by Aidan Brady · 10 years ago
- fef1fb6 Committed the other files I meant to commit. by Tonius · 10 years ago
- d6cf9a8 Various fixes to rendering by Tonius · 10 years ago
- e2913e2 Work on reactor GUI. by Ben Spiers · 10 years ago
- e004fdc Merge branch 'development' into 1.8 by Ben Spiers · 10 years ago
- d0d660b Merge branch 'master' into development by Ben Spiers · 10 years ago
- 1d61c3d Tweak energynet logic a bit to safeguard against overly high tiers of IC2 acceptor and things that implement everything but with only one working. by Ben Spiers · 10 years ago
- 31e24ec Fixed default enchantibilities by Aidan C. Brady · 10 years ago
- 3abd80f Generators now sustain fluid and gas data by Aidan C. Brady · 10 years ago
- ce5bddb Merge branch 'development' into 1.8 by Aidan C. Brady · 10 years ago
- ab34edc Finished off new system of sustained data by Aidan C. Brady · 10 years ago
- 94c3a6a Started work on a new system of managing sustained data by Aidan C. Brady · 10 years ago
- 7ac7fbc Sustained gas and fluid support for Chemical Washer, Chemical Crystallizer and Chemical Infuser by Aidan C. Brady · 10 years ago
- 2876eb5 Merge branch 'master' into development by Aidan C. Brady · 10 years ago
- ba289ce Added sustained fluid and gas tanks to PRC and Electrolytic Separator, fixed Gas Generator losing energy when being picked up by Aidan C. Brady · 10 years ago
- aaffc3e Updated some imports and added textures by Aidan C. Brady · 10 years ago
- 3d1b256 Merge pull request #1576 from fewizz/patch-1 by Aidan · 10 years ago
- e7bfdef Merge pull request #1578 from jmongeon/master by Aidan · 10 years ago
- f768dab Update ru_RU.lang by fewizz · 10 years ago
- 1689031 Fix Gas Generator not accepting Buildcraft fuels. by jmongeon · 10 years ago
- 22b3097 Laser model! Also added some new Reactor Block assets. by Aidan C. Brady · 10 years ago
- 5f268ae More texture updates by Aidan C. Brady · 10 years ago
- b992d68 Updated some textures, also added textures for Laser and upcoming Neutronic Centrifuge by Aidan C. Brady · 10 years ago
- 5bee399 Merge branch 'development' into 1.8 by Aidan C. Brady · 10 years ago
- bb8985b Fixed a few energy transfer issues by Aidan C. Brady · 10 years ago
- 2b5bb53 Fixed a few recipe issues by Aidan C. Brady · 10 years ago
- d8e94b0 Added effect information to upgrade GUI by Aidan C. Brady · 10 years ago
- 52efdac Eliminated the deprecated "getSpeedMultiplier()" and "getEnergyMultiplier()" methods by Aidan C. Brady · 10 years ago
- 523ec21 Added button to remove upgrade, fixed font size. Almost done! by Aidan C. Brady · 10 years ago
- 790cd33 Merge branch '1.8' of https://github.com/aidancbrady/Mekanism into 1.8 by Aidan C. Brady · 10 years ago
- 6470f69 A big load of work on the new upgrade GUI by Aidan C. Brady · 10 years ago
- 84daf18 More Reactor GUI work by Ben Spiers · 10 years ago
- 775ba68 Tweaking of lasers for packet-efficiency by Ben Spiers · 10 years ago
- c66676d Fix some Server-side packets being sent by the client by Ben Spiers · 10 years ago
- 327389a Get Lasers kind of working vs. dediservers by Ben Spiers · 10 years ago
- dd421f7 This should stop the servercrashing issue by Ben Spiers · 10 years ago
- a2bb224 Fix transmitter render pass to stop things occluding incorrectly, make lasers get stronger and weaker as they start and stop by Ben Spiers · 10 years ago
- e35a673 Get lasers rendering. I've yet to proxy it off, so THIS WILL CRASH DEDICATED SERVERS by Ben Spiers · 10 years ago
- 733da73 Add LiquidChlorine meta file by Ben Spiers · 10 years ago
- 99482d8 Fixed a minor issue by Aidan C. Brady · 10 years ago
- 25cf523 A few fixes by Aidan C. Brady · 10 years ago
- 076c5f7 More work! by Aidan C. Brady · 10 years ago
- 2523d2f Did some work on actual upgrade system by Aidan C. Brady · 10 years ago
- 4355968 Merge branch 'development' into 1.8 by Aidan C. Brady · 10 years ago
- cdb1ad2 Attempted a fix for a strange connection error by Aidan C. Brady · 10 years ago
- 0b8ec37 More work on upgrade GUI, also made SimpleGui packets send new window ID to client by Aidan C. Brady · 10 years ago
- e778449 More work! Finished off the upgrade tab and removed upgrade slot from all upgrade-wielding containers. by Aidan C. Brady · 10 years ago
- 48183f6 Work on the new upgrade system, specifically with GUI changes by Aidan C. Brady · 10 years ago
- f2441a1 Merge branch 'development' into 1.8 by Aidan C. Brady · 10 years ago
- b4be235 Merge branch 'master' into development by Aidan C. Brady · 10 years ago
- 5f26402 Minor cleanup and tabs by Ben Spiers · 10 years ago
- 0864e10 Merge a few more fixes by Aidan C. Brady · 10 years ago
- 27056da Merge back a few bug fixes by Aidan C. Brady · 10 years ago
- 4fcd3b4 Fix a few little bugs by Aidan C. Brady · 10 years ago
- fd9fb07 Merge pull request #1559 from jstockwin/development by Ben Spiers · 10 years ago
- 0a9dbec Stop energy cube core rendering when cube is empty. by jstockwin · 10 years ago
- cc33ad2 Update Development.md by Ben Spiers · 10 years ago
- d16483f Started work on the new upgrade system, as well as the new GUI by Aidan C. Brady · 10 years ago
- 0416e2e Finished Digital Miner visual render functionality, also fixed a few issues with gas tanks by Aidan C. Brady · 10 years ago
- 69a4118 Started work on a Digital Miner visual render thing. For some reason it's culling all oceans. by Aidan C. Brady · 10 years ago
- 7e525e1 Fixed a few recipes, also started work on Digital Miner visual by Aidan C. Brady · 10 years ago
- c1b317d Added in warning for missing stacks. Onto visual Digital Miner range rendering! by Aidan C. Brady · 10 years ago
- 2b817e2 Fixed an issue with Bins, also fixed a small GUI issue with the new filter system by Aidan C. Brady · 10 years ago
- de86e0b Finished off the filtering system! Also added new "fuzzy mode" to ItemStack filters in order to ignore metadata checks. by Aidan C. Brady · 10 years ago
- 4adb6de Fix a few bugs by Aidan C. Brady · 10 years ago
- fe177d2 Filter-based replacing works! Now to get the require system to work and the warning system set up. by Aidan C. Brady · 10 years ago
- ad505cf More work! Networking is just about complete, and all filter creation and edit GUIs now have replace stack slots and replace required buttons. by Aidan C. Brady · 10 years ago
- e66d4c5 Merge branch 'development' into 1.8 by Aidan C. Brady · 10 years ago
- 545849f Merge branch 'master' into development by Aidan C. Brady · 10 years ago
- ddc499c More work on Digital Miner filter system, also fixed a little memory leak by Aidan C. Brady · 10 years ago
- db7b44e Merge pull request #1547 from sb023612/master by Aidan · 10 years ago
- 7660a82 Update zh_CN.lang by sb023612 · 10 years ago