tilera/Mekanism-tilera-Edition
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
2105 commits 2 branches 0 tags 102 MiB
Commit graph

2105 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Aidan
32303a2b46 Merge pull request #1414 from dschub/auto-eject-color 
Fix Logistical Sorter auto-eject coloring
 2014-06-16 11:30:02 +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
7b6eb46a33 Hopefully fixed Forge 2014-06-14 00:22:15 +02:00
Aidan C. Brady
70abe40b1f Mod ID filters :) 2014-06-13 20:58:50 +02:00
Aidan
73135fbb87 Merge pull request #1409 from Adaptivity/patch-3 
Update ru_RU.lang
 2014-06-13 19:50:47 +02:00
Aidan C. Brady
c9ce7f1983 Hopefully got NEI to download 2014-06-13 19:45:28 +02:00
Aidan C. Brady
5a4b229ca6 Whoops 2014-06-13 12:41:26 +02:00
Aidan C. Brady
c2e0e2eb44 Try updating forge 2014-06-13 12:40:08 +02:00
Aidan C. Brady
8b7904563d Hopefully fix something 2014-06-13 12:27:35 +02:00
Aidan C. Brady
96973190b7 Another fix 2014-06-13 11:39:04 +02:00
Aidan C. Brady
df13fd4d02 Hopefully fixed build 2014-06-13 11:37:08 +02:00
Anton
0b3244c4f1 Update ru_RU.lang 2014-06-13 11:32:19 +04:00
Aidan C. Brady
704b3e2ac1 Attempt to fix build script 2014-06-13 01:29:27 +02:00
Aidan C. Brady
dd4fa16d00 Update FMP and CCLIB versions 2014-06-13 00:45:28 +02:00
Aidan C. Brady
43a80c7a89 Update forge version 2014-06-13 00:34:54 +02: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