Commit graph

1726 commits

Author SHA1 Message Date
tterrag1098 6ac750520c Blocks and Entities 2014-05-06 03:14:44 -04:00
tterrag1098 321fa4ed50 Some work on GUIs, mostly sfx 2014-05-06 02:57:39 -04:00
Aidan Brady 935be33fdf Hey guys, I'm back. Starting some work on the 1.7 port, thanks to @unpairedbracket for getting the brunt of the work done. 2014-05-04 12:19:43 -04:00
Ben Spiers 3d8c5c8696 More fixes. Around 1000 errors now, going to have to leave it to you from here on in @aidancbrady. 2014-04-20 22:34:45 +01:00
Ben Spiers 31938e8b68 Under 1300 errors left now, started on packet/network stuffs. 2014-04-20 21:15:44 +01:00
Ben Spiers 86777694e5 Add Intellij project file to .gitignore. 2014-04-20 04:36:18 +01:00
Ben Spiers db7121454a Re-add an updated ic2, alter CC and update DepLoader. Fix more of the things.
1792 errors. A good night's work, I think.
2014-04-20 04:34:19 +01:00
Ben Spiers ab47724473 Move the directory structure around to a more conventional one and start out on the 1.7 update.
3797 errors. We have a long way to go.
2014-04-20 03:44:06 +01:00
Ben Spiers 3a0de87a09 Remove some unused textures that I couldn't find being used any more. Remove the WIP label from the PRC texture. 2014-04-19 21:07:49 +01:00
Ben Spiers fd425b3146 I hereby declare this Mekanism 6.1.0! 2014-04-19 20:49:58 +01:00
Ben Spiers 36430cd52e Add tiered mechanical pipe recipes. 2014-04-19 20:30:36 +01:00
Ben Spiers 15a8cfe9db Work on un-screwing up NEI recipe GUIs. 2014-04-19 01:41:48 +01:00
Ben Spiers 3bde351458 Adjust some ratios, make ethylene's energy density a function of hydrogen's and biofuel's. 2014-04-18 22:21:23 +01:00
Ben Spiers af1e55f54b Remove some more unneccessary gui bits 2014-04-18 02:59:34 +01:00
Ben Spiers 95e8d2c5bb More gui work. I've just noticed this all has screwed up NEI. I'll try to sort that later. 2014-04-18 02:34:19 +01:00
Ben Spiers e92843dccb Reduce H2 energy density by factor 10 to make balance seem a bit more fair. 2014-04-17 02:11:05 +01:00
Ben Spiers 9d06fa91c1 Prepare some gui textures and texture sheets for upcoming GuiProgress. 2014-04-17 02:06:47 +01:00
Ben Spiers 9e76b3b473 Finish up some PRC stuff 2014-04-17 02:03:42 +01:00
Ben Spiers 676773eff7 Rename a method. 2014-04-17 02:02:25 +01:00
Ben Spiers e8769b4ffd Some Heat Generator changes: bring other fuels into line with lava buckets and provide a large passive boost in the nether. 2014-04-16 02:38:30 +01:00
Ben Spiers 97c5e98d91 Generators and Energy Cube Gui improvements. 2014-04-16 02:36:52 +01:00
Ben Spiers 03f06e057f Make brown orange. It's the closest colour I can find. 2014-04-16 02:34:46 +01:00
Ben Spiers af8973f18a Add Plastic road, update lang. 2014-04-16 00:08:09 +01:00
Ben Spiers 1fec6464e1 Fix recolour. It uses wool colours, not dye colours. 2014-04-16 00:06:25 +01:00
Ben Spiers 24d620facc Glow Panel item rendering 2014-04-15 03:18:21 +01:00
Ben Spiers 386fd4e770 Add recolourBlock support to plastic. 2014-04-15 01:38:14 +01:00
Ben Spiers 4b6cc394f5 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. 2014-04-15 01:31:13 +01:00
Ben Spiers 8786b16b58 Merge branch 'development' into greylocke
Conflicts:
	resources/assets/mekanism/lang/pl_PL.lang
2014-04-14 17:11:48 +01:00
Ben Spiers 51c1bd4500 Merge branch 'master' into development 2014-04-14 17:07:36 +01:00
Ben Spiers 0ec86c5b9b Also recommit Coal Block changes. Same problem. 2014-04-14 17:02:43 +01:00
Ben Spiers 8fd3c628a0 Remove some unused imports 2014-04-14 16:44:01 +01:00
Ben Spiers bdefd61f44 Recommit the Armour and tool balance config. It disappeared somehow when the 6.0.4 update was committed. 2014-04-14 16:42:00 +01:00
Ben Spiers 61adaabec8 Recommit the Armour and tool balance config. It disappeared somehow when the 6.0.4 update was committed. 2014-04-14 16:41:35 +01:00
Ben Spiers 9eb207a7ff Add Glow Panel to localisation files 2014-04-14 01:42:47 +01:00
Ben Spiers 1a6030c1a5 Discover native block colouring support within normal block rendering code. 2014-04-13 23:40:51 +01:00
Ben Spiers 3dd06cca78 Glow panels. 2014-04-13 03:05:50 +01:00
Ben Spiers b3939c0b52 Update ComputerCraft API. No idea if I've implemented IPeripheral.equals() correctly, its documentation is not the most helpful. 2014-04-12 18:49:25 +01:00
Ben Spiers b5331b4141 Oops. 2014-04-12 18:45:02 +01:00
Ben Spiers aac74a100a Lots of GUI element work. Fixed Crystallizer typo. 2014-04-12 02:51:02 +01:00
Ben Spiers ffbd61d12c Remove IEnergySink from UniCables, it's not needed any more. 2014-04-11 21:12:54 +01:00
Ben Spiers 208e8fe277 Make universal cables pull from IC2 Sources when in PULL mode.
This concludes work on making our IC2 support not suck.
2014-04-11 21:12:45 +01:00
Ben Spiers e6bc2b4444 Remove IC2 reception support from UniCables. Fixes #1123 and #1280. 2014-04-11 21:12:36 +01:00
Ben Spiers 5edf734292 Gui work 2014-04-11 21:10:14 +01:00
Ben Spiers 2b9c859618 Remove IEnergySink from UniCables, it's not needed any more. 2014-04-11 19:50:19 +01:00
Ben Spiers 28fd4b2f56 Add HDPE block recipes. 2014-04-11 18:22:25 +01:00
Ben Spiers 30c6a3b3b2 Work on localisations and Item rendering. 2014-04-11 03:32:52 +01:00
Ben Spiers 174167de57 Make universal cables pull from IC2 Sources when in PULL mode.
This concludes work on making our IC2 support not suck.
2014-04-11 03:32:17 +01:00
Ben Spiers 0dd1385702 Remove IC2 reception support from UniCables. Fixes #1123 and #1280. 2014-04-10 23:50:16 +01:00
Ben Spiers d90648ace2 Fix ElectricBlocks not accepting from IC2. Stuff seems to come from UNKNOWN a lot... 2014-04-10 23:45:59 +01:00
kostek00 575ba0ad65 Update pl_PL.lang
Translated lacking lines, moved lines to mach en_US.lang file, changed translation for some items and blocks and changed big letter for second and later words as there is no such thing in polish if it's not invented name which they aren't.
2014-04-10 03:07:27 +01:00