- d1c3b3b Manually merged riches' PR by Aidan C. Brady · 10 years ago
- a973ef1 Merge branch 'development' of https://github.com/aidancbrady/Mekanism into development by Aidan C. Brady · 10 years ago
- 1137b95 Quick fix for Tellurium by Aidan C. Brady · 10 years ago
- 96a52dd Merge pull request #1373 from Vexatos/patch-2 by Aidan · 10 years ago
- 91cd34b Harvest levels! Yeah! by Aidan C. Brady · 10 years ago
- bda4f8c Fixed Walkie Talkies by Aidan C. Brady · 10 years ago
- f0d3848 Sounds work! Also got tick handlers set up, still have to do a few things by Aidan C. Brady · 10 years ago
- 815944c A major load of fixes - things should be about back to normal now. by Aidan C. Brady · 10 years ago
- 322301c Added RecipeSorter registrations, fixed a few things by Aidan C. Brady · 10 years ago
- b365494 Fixed up logger, added needed overlays by Aidan C. Brady · 10 years ago
- 9a16625 Updated build.gradle by Aidan C. Brady · 10 years ago
- 5b611c9 0 errors. This is it, the first building build of Mekanism for 1.7.2, and also the most buggy build of Mekanism to date most likely. by Aidan C. Brady · 10 years ago
- 4446e14 Sound system work by Aidan C. Brady · 10 years ago
- 295efab More error fixes, down to 11! by Aidan C. Brady · 10 years ago
- 1933723 Major packet work, I think it's done. 34 errors to go! by Aidan C. Brady · 10 years ago
- 659b963 Alright, almost done with network changes (63 errors!) by Aidan C. Brady · 10 years ago
- 8405598 About halfway through netty conversion by Aidan C. Brady · 10 years ago
- ec2040c Work on networking update by Aidan C. Brady · 10 years ago
- ea3f340 Update de_DE.lang by Vexatos · 10 years ago
- da44432 A bit of work on sounds by Aidan C. Brady · 10 years ago
- 8be5ecf Down to 215 errors, pretty much everything is packets now by Aidan C. Brady · 11 years ago
- fa0c2e6 More bits of work by Aidan C. Brady · 11 years ago
- bd7b8f7 Merge branch 'master' into development by Aidan C. Brady · 11 years ago
- 05995db Merge pull request #1359 from dschub/master by Aidan · 11 years ago
- d1c193d Loads more work. 275 errors. by Aidan C. Brady · 11 years ago
- 6f69c6d Major 1.7 work, down to a little more than 500 errors by Aidan C. Brady · 11 years ago
- 17c8874 Fix Logistical Transporter Item Loss (#1353) by dschub · 11 years ago
- 1d22dda Merge branch 'master' into development by Aidan C. Brady · 11 years ago
- 5a83069 Merge pull request #1334 from ngreatorex/ncg by Aidan · 11 years ago
- db20084 Change Digital Miner GUI to show actual energy usage per tick by Neil Greatorex · 11 years ago
- 6025572 Merge branch '1.7' into development (We're back to two branches) by Aidan Brady · 11 years ago
- 0606d6d Actual 6.0.4 release by Aidan Brady · 11 years ago
- 7496ac7 Some 1.7 work. Just about 800 errors! by Aidan Brady · 11 years ago
- e20674d Merge pull request #1330 from tterrag1098/1.7 by Aidan · 11 years ago
- 6ac7505 Blocks and Entities by tterrag1098 · 11 years ago
- 321fa4e Some work on GUIs, mostly sfx by tterrag1098 · 11 years ago
- 750d468 Merge branch 'master' into development by Aidan Brady · 11 years ago
- 533e04d Merge pull request #1320 from richie3366/master by Aidan · 11 years ago
- 5c0e753 Merge pull request #1286 from tterrag1098/patch-5 by Aidan · 11 years ago
- 2a83f00 Merge pull request #1285 from Vexatos/patch-1 by Aidan · 11 years ago
- f9c19cc Merge pull request #1277 from BrunoLG/patch-1 by Aidan · 11 years ago
- 935be33 Hey guys, I'm back. Starting some work on the 1.7 port, thanks to @unpairedbracket for getting the brunt of the work done. by Aidan Brady · 11 years ago
- 21b2ab7 Fixing the peripheral.wrap issue with CC 1.63 by Richie · 11 years ago
- 49cb1fc Made the inverse setting not reset each time you break/place the Digital Miner by Richie · 11 years ago
- ef5737f Remove a bad import that was making gradle builds fail. by Ben Spiers · 11 years ago
- 3d8c5c8 More fixes. Around 1000 errors now, going to have to leave it to you from here on in @aidancbrady. by Ben Spiers · 11 years ago
- 31938e8 Under 1300 errors left now, started on packet/network stuffs. by Ben Spiers · 11 years ago
- 8677769 Add Intellij project file to .gitignore. by Ben Spiers · 11 years ago
- db71214 Re-add an updated ic2, alter CC and update DepLoader. Fix more of the things. by Ben Spiers · 11 years ago
- ab47724 Move the directory structure around to a more conventional one and start out on the 1.7 update. by Ben Spiers · 11 years ago
- 08c374c Oops. Missed that one by Ben Spiers · 11 years ago
- 3a0de87 Remove some unused textures that I couldn't find being used any more. Remove the WIP label from the PRC texture. by Ben Spiers · 11 years ago
- fd425b3 I hereby declare this Mekanism 6.1.0! by Ben Spiers · 11 years ago
- 36430cd Add tiered mechanical pipe recipes. by Ben Spiers · 11 years ago
- 15a8cfe Work on un-screwing up NEI recipe GUIs. by Ben Spiers · 11 years ago
- 3bde351 Adjust some ratios, make ethylene's energy density a function of hydrogen's and biofuel's. by Ben Spiers · 11 years ago
- af1e55f Remove some more unneccessary gui bits by Ben Spiers · 11 years ago
- 95e8d2c More gui work. I've just noticed this all has screwed up NEI. I'll try to sort that later. by Ben Spiers · 11 years ago
- e92843d Reduce H2 energy density by factor 10 to make balance seem a bit more fair. by Ben Spiers · 11 years ago
- 9d06fa9 Prepare some gui textures and texture sheets for upcoming GuiProgress. by Ben Spiers · 11 years ago
- 9e76b3b Finish up some PRC stuff by Ben Spiers · 11 years ago
- 676773e Rename a method. by Ben Spiers · 11 years ago
- e8769b4 Some Heat Generator changes: bring other fuels into line with lava buckets and provide a large passive boost in the nether. by Ben Spiers · 11 years ago
- 97c5e98 Generators and Energy Cube Gui improvements. by Ben Spiers · 11 years ago
- 03f06e0 Make brown orange. It's the closest colour I can find. by Ben Spiers · 11 years ago
- af8973f Add Plastic road, update lang. by Ben Spiers · 11 years ago
- 1fec646 Fix recolour. It uses wool colours, not dye colours. by Ben Spiers · 11 years ago
- 24d620f Glow Panel item rendering by Ben Spiers · 11 years ago
- 386fd4e Add recolourBlock support to plastic. by Ben Spiers · 11 years ago
- 4b6cc39 Change some HDPE stuff. They don't need TileEntities or renderers any more but they use 4 ids now. I couldn't see any other way around. by Ben Spiers · 11 years ago
- 8786b16 Merge branch 'development' into greylocke by Ben Spiers · 11 years ago
- 51c1bd4 Merge branch 'master' into development by Ben Spiers · 11 years ago
- 0ec86c5 Also recommit Coal Block changes. Same problem. by Ben Spiers · 11 years ago
- 8fd3c62 Remove some unused imports by Ben Spiers · 11 years ago
- bdefd61 Recommit the Armour and tool balance config. It disappeared somehow when the 6.0.4 update was committed. by Ben Spiers · 11 years ago
- 61adaab Recommit the Armour and tool balance config. It disappeared somehow when the 6.0.4 update was committed. by Ben Spiers · 11 years ago
- 9eb207a Add Glow Panel to localisation files by Ben Spiers · 11 years ago
- 1a6030c Discover native block colouring support within normal block rendering code. by Ben Spiers · 11 years ago
- 3dd06cc Glow panels. by Ben Spiers · 11 years ago
- b3939c0 Update ComputerCraft API. No idea if I've implemented IPeripheral.equals() correctly, its documentation is not the most helpful. by Ben Spiers · 11 years ago
- b5331b4 Oops. by Ben Spiers · 11 years ago
- aac74a1 Lots of GUI element work. Fixed Crystallizer typo. by Ben Spiers · 11 years ago
- ffbd61d Remove IEnergySink from UniCables, it's not needed any more. by Ben Spiers · 11 years ago
- 208e8fe Make universal cables pull from IC2 Sources when in PULL mode. by Ben Spiers · 11 years ago
- e6bc2b4 Remove IC2 reception support from UniCables. Fixes #1123 and #1280. by Ben Spiers · 11 years ago
- 5edf734 Gui work by Ben Spiers · 11 years ago
- 2b9c859 Remove IEnergySink from UniCables, it's not needed any more. by Ben Spiers · 11 years ago
- 28fd4b2 Add HDPE block recipes. by Ben Spiers · 11 years ago
- 9e53b6f Armored jetpack now gives a reasonable amount of protection by tterrag1098 · 11 years ago
- 30c6a3b Work on localisations and Item rendering. by Ben Spiers · 11 years ago
- 174167d Make universal cables pull from IC2 Sources when in PULL mode. by Ben Spiers · 11 years ago
- 0dd1385 Remove IC2 reception support from UniCables. Fixes #1123 and #1280. by Ben Spiers · 11 years ago
- d90648a Fix ElectricBlocks not accepting from IC2. Stuff seems to come from UNKNOWN a lot... by Ben Spiers · 11 years ago
- 575ba0a Update pl_PL.lang by kostek00 · 11 years ago
- 04668a1 HDPE Blocks! 64 new cosmetic blocks for the low low price of just 4 new textures! by Ben Spiers · 11 years ago
- 9e799ce Work on giving the PRC a GUI and adding in some missing textures (I don't usually do pixel art for a reason. This reason should be apparent). by Ben Spiers · 11 years ago
- 6ef4b4b Access modifiers are generally advisable. by Ben Spiers · 11 years ago
- e3496ea Merge branch 'development' into greylocke by Ben Spiers · 11 years ago
- 1a111cc Update FMP, allow sided hollow-cover behaviour. by Ben Spiers · 11 years ago
- 8373b93 More work on Guis and elements by Ben Spiers · 11 years ago