Calclavia
|
ce458d2e77
|
Revert "Fixed #433 - Electric bolt render NPE"
This reverts commit 92993e832d.
|
2013-11-20 20:21:10 +08:00 |
|
Aidan Brady
|
85f759e5e6
|
Merge branch 'master' of https://github.com/aidancbrady/Mekanism
|
2013-11-20 07:20:38 -05:00 |
|
Aidan Brady
|
2d1dabd6b2
|
Fix a few crashes
|
2013-11-20 07:20:32 -05:00 |
|
Calclavia
|
92993e832d
|
Fixed #433 - Electric bolt render NPE
|
2013-11-20 20:18:12 +08:00 |
|
Aidan Brady
|
7f9acda277
|
Aw yeah. This GUI…is coming together.
|
2013-11-19 22:27:28 -05:00 |
|
Aidan Brady
|
515cbf38c8
|
Fixes!
|
2013-11-19 22:13:35 -05:00 |
|
Aidan C. Brady
|
fc1cb7926c
|
Added in some descriptive text to the GUI.
|
2013-11-19 20:15:03 -05:00 |
|
Aidan C. Brady
|
73bf81ceaa
|
GUI is coming together! Still need to add reset button and map button actions, but layout is there.
|
2013-11-19 19:30:56 -05:00 |
|
Aidan C. Brady
|
d02d0ceadf
|
GUI work, kinda functions, but not really
|
2013-11-19 18:56:53 -05:00 |
|
Aidan C. Brady
|
7a74fb86ba
|
More work!
|
2013-11-19 18:16:26 -05:00 |
|
Aidan C. Brady
|
87f5bbcde2
|
Work on networking and GUIs of Digital Miner
|
2013-11-19 17:39:16 -05:00 |
|
Aidan C. Brady
|
c9deba55df
|
Provide replace stacks
|
2013-11-19 15:38:18 -05:00 |
|
Aidan C. Brady
|
3939000190
|
More work!
|
2013-11-19 12:29:50 -05:00 |
|
Aidan C. Brady
|
86b6474f35
|
Beginning foundations of Digital Miner.
|
2013-11-19 12:13:37 -05:00 |
|
Aidan Brady
|
ba66b6fc9f
|
Work on miner!
|
2013-11-18 22:15:03 -05:00 |
|
Aidan C. Brady
|
995207bcab
|
Start work on Miner, make the Bin only eject items when front side is clicked!
|
2013-11-18 15:33:14 -05:00 |
|
Aidan C. Brady
|
c1288c514e
|
Merge branch 'master' of https://github.com/aidancbrady/Mekanism
|
2013-11-18 14:51:04 -05:00 |
|
Aidan C. Brady
|
2594918bee
|
Double-click inserting on Bins
|
2013-11-18 14:50:59 -05:00 |
|
Aidan
|
8a884cf2ae
|
Merge pull request #425 from VeryBigBro/patch-1
Russian localization
|
2013-11-18 05:39:42 -08:00 |
|
Anton
|
99178d8e68
|
Swap Glow and Steel names to match with other(No other changes)
|
2013-11-18 14:50:18 +03:00 |
|
Anton
|
3dc83d8296
|
Create ru_RU.lang
Not yet finished...
|
2013-11-18 14:47:40 +03:00 |
|
Aidan Brady
|
52d42e99f2
|
Fix ItemProxy leak
|
2013-11-17 23:37:02 -05:00 |
|
Aidan Brady
|
cc5d4281a2
|
Fix container item issue
|
2013-11-17 20:14:00 -05:00 |
|
Aidan Brady
|
0e0594a69b
|
Electric Chest charges when in inventory
|
2013-11-17 19:56:16 -05:00 |
|
Aidan Brady
|
a63a8902f2
|
Sounds should be fixed.
|
2013-11-17 19:25:52 -05:00 |
|
Aidan Brady
|
f988c54134
|
Hopefully the final fix
|
2013-11-17 19:16:40 -05:00 |
|
Aidan Brady
|
147fb7609d
|
Try removing extra url junk
|
2013-11-17 19:07:18 -05:00 |
|
Aidan Brady
|
1beffb92e4
|
Merge branch 'master' of https://github.com/aidancbrady/Mekanism
|
2013-11-17 19:03:51 -05:00 |
|
Aidan Brady
|
40dd6798ea
|
Attempted sound fixes
Guaranteed not to work :)
|
2013-11-17 19:03:44 -05:00 |
|
Aidan
|
bf814dfae0
|
More quotes :(
|
2013-11-17 17:30:29 -05:00 |
|
Aidan
|
2cebebac83
|
Use UTF8-supported quotes
|
2013-11-17 17:24:35 -05:00 |
|
Aidan Brady
|
be73495110
|
…and part 2. Textures fixed.
|
2013-11-17 13:52:23 -05:00 |
|
Aidan Brady
|
80bdfc10b9
|
For some reason this is necessary. Part 1…
|
2013-11-17 13:52:10 -05:00 |
|
Aidan Brady
|
6a4750f90b
|
Hopefully fixed sounds…
|
2013-11-17 13:39:40 -05:00 |
|
Aidan Brady
|
8095eb206c
|
Fix textures, hopefully fix sounds
|
2013-11-17 13:31:56 -05:00 |
|
Aidan Brady
|
8a79352563
|
Debugging sound system
|
2013-11-17 13:23:19 -05:00 |
|
Aidan
|
400ccc56cd
|
Update README.md
|
2013-11-17 12:32:57 -05:00 |
|
Aidan Brady
|
fe33689d13
|
Fixed OS X quote characters
|
2013-11-17 11:59:58 -05:00 |
|
Aidan Brady
|
a1f814a953
|
Merge branch 'master' of https://github.com/aidancbrady/Mekanism
|
2013-11-17 10:55:27 -05:00 |
|
Aidan Brady
|
17d36cad4d
|
Fixes and enhancements for TE
|
2013-11-17 10:55:20 -05:00 |
|
Calclavia
|
ba9803e9d7
|
Fixed Mekanism not showing Minecraft version in builds
|
2013-11-17 19:35:14 +08:00 |
|
Aidan
|
dd23729d5e
|
Merge pull request #413 from crafteverywhere/patch-1
Update zh_CN.lang
|
2013-11-16 19:26:26 -08:00 |
|
crafteverywhere
|
fdf09fcfde
|
Update zh_CN.lang
|
2013-11-17 11:21:43 +08:00 |
|
Aidan Brady
|
e17d290531
|
Fix?
|
2013-11-16 19:10:55 -05:00 |
|
Aidan Brady
|
ae0edd50dc
|
Fix Universal Cable TE support, fix build.xml
|
2013-11-16 19:08:47 -05:00 |
|
Aidan Brady
|
67db8c522a
|
Fix TE support :)
|
2013-11-16 18:56:01 -05:00 |
|
Aidan Brady
|
e9382e64a9
|
Fixes!
|
2013-11-16 17:23:50 -05:00 |
|
Aidan C. Brady
|
f2fd5c382f
|
Merge branch 'master' of https://github.com/aidancbrady/Mekanism
|
2013-11-16 16:55:27 -05:00 |
|
Aidan C. Brady
|
57b1343311
|
Batteries are less buggy and more efficient
|
2013-11-16 16:55:20 -05:00 |
|
Aidan
|
763e123570
|
Merge pull request #409 from Vexatos/patch-2
No more wires? :(
|
2013-11-16 13:34:28 -08:00 |
|