CrazyPants
|
afef7c4e3f
|
Merge pull request #735 from tterrag1098/patch-1
Fix channel name copypasta
|
2014-06-07 09:24:08 +08:00 |
|
CrazyPants
|
bc55ccc40a
|
Added 'snapshot' feature to new filter.
|
2014-06-07 19:23:00 +08:00 |
|
CrazyPants
|
135877c1be
|
Added item filter that only accepts items already in an inventory.
Fixed GUI alignment.
|
2014-06-07 16:22:27 +08:00 |
|
CrazyPants
|
bdca623526
|
And the same fix again.
|
2014-06-07 08:51:09 +08:00 |
|
CrazyPants
|
8161383aeb
|
#730 Stack Overflow with ds axe and ds pick next to each other in hot bar when right click.
|
2014-06-07 08:47:46 +08:00 |
|
CrazyPants
|
c1f2e608c1
|
Tweak to magnet duration.
|
2014-06-07 08:32:28 +08:00 |
|
tterrag1098
|
4ec6dc6b68
|
Fix channel name copypasta
|
2014-06-06 14:23:07 -04:00 |
|
CrazyPants
|
0ff8b63c3a
|
#710 Configurable power (and power output/input) per capacitor bank
|
2014-06-06 17:30:56 +08:00 |
|
CrazyPants
|
ae6bea6c91
|
Increased min forge version to 1090 (needed for new packet stuff).
Made conduit settings tab appear in a consistent order.
|
2014-06-06 00:07:47 +08:00 |
|
CrazyPants
|
287f30c3fb
|
Fixed texture derp.
|
2014-06-05 22:42:24 +08:00 |
|
CrazyPants
|
137ec8bce4
|
Added alt. recipe for the enlightened glasses.
|
2014-06-05 22:02:34 +08:00 |
|
CrazyPants
|
5e9fa7f951
|
Various fixes.
|
2014-06-05 21:49:22 +08:00 |
|
CrazyPants
|
681c8fb37d
|
Fixed 1000x times intended duration for zombie fuel.
|
2014-06-05 18:02:35 +08:00 |
|
CrazyPants
|
4e8ef3f362
|
It compiles AND crashes a lot. Woohoo!
|
2014-06-05 17:40:15 +08:00 |
|
CrazyPants
|
e159f6e4e5
|
Merge branch '1.7' of https://github.com/tterrag1098/EnderIO into 1.7
|
2014-06-05 14:55:21 +08:00 |
|
CrazyPants
|
8b7e51b687
|
Added code to automagicaly convert old item conduits to new ones (with appropriate upgrades etc)
|
2014-06-05 13:36:19 +08:00 |
|
CrazyPants
|
1d6d2261a4
|
Changed item conduits to be a single, upgradable conduit.
|
2014-06-05 00:17:47 +08:00 |
|
CrazyPants
|
20a6fba530
|
It is ready to test!
|
2014-06-05 00:10:13 +08:00 |
|
CrazyPants
|
373ccab6d3
|
Item filter upgrades seem to now be working.
|
2014-06-04 23:14:46 +08:00 |
|
CrazyPants
|
b44e727639
|
I hate you GUIs.
|
2014-06-04 22:52:00 +08:00 |
|
CrazyPants
|
9a9cda5849
|
time to cry?
|
2014-06-04 21:19:32 +08:00 |
|
CrazyPants
|
fa1e27774b
|
Closer.
|
2014-06-04 19:37:57 +08:00 |
|
CrazyPants
|
d5250cacc1
|
Oh so slowly getting there.
|
2014-06-04 17:01:34 +08:00 |
|
CrazyPants
|
ac0b051126
|
Ug.
|
2014-06-04 16:12:05 +08:00 |
|
tterrag1098
|
bde898fa67
|
Back to where we were
|
2014-06-03 16:36:51 -04:00 |
|
tterrag1098
|
b955c0e048
|
Merge branch 'CrazyPants-1.7' into 1.7
|
2014-06-03 16:25:51 -04:00 |
|
tterrag1098
|
d7c3f9283c
|
Merge branch '1.7' of https://github.com/CrazyPants/EnderIO into CrazyPants-1.7
Conflicts:
src/main/java/crazypants/enderio/conduit/gui/ItemSettings.java
src/main/java/crazypants/enderio/conduit/packet/PacketItemConduitFilter.java
|
2014-06-03 16:24:16 -04:00 |
|
tterrag1098
|
5f5e856ceb
|
Start work on machines and fix some mistakes.
|
2014-06-03 07:59:34 -04:00 |
|
tterrag1098
|
ec975567b2
|
Only machines package remains, lots to do in there.
|
2014-06-03 07:20:07 -04:00 |
|
tterrag1098
|
d16b3ddd6b
|
Begin SimpleImpl upgrade.
|
2014-06-03 05:18:09 -04:00 |
|
CrazyPants
|
78c2586da3
|
Implemented priority for item conduit outputs.
|
2014-06-03 02:07:33 +08:00 |
|
CrazyPants
|
4ebb438153
|
Added round robin mode to item conduits.
|
2014-06-03 00:39:09 +08:00 |
|
CrazyPants
|
f2798cf460
|
Registered EIO alloys in ore dic.
|
2014-06-02 22:01:05 +08:00 |
|
CrazyPants
|
d000c53811
|
Merge pull request #722 from VapourDrive/1.7
Steel in machine chassi option
|
2014-06-02 15:10:29 +08:00 |
|
CrazyPants
|
977c2ac334
|
Merge branch '1.7' of https://github.com/CrazyPants/EnderIO into 1.7
|
2014-06-02 14:36:46 +08:00 |
|
CrazyPants
|
eb267c78ef
|
#715 standing on a travle anchor, looking at an ender io , and then jumping causes a client crash
|
2014-06-02 14:36:20 +08:00 |
|
VapourDrive
|
336baaf525
|
Added config option for using steel in the machine chassi instead of
iron ingots (will resort to iron if there isn't a steel entry)
|
2014-06-01 21:11:49 -04:00 |
|
VapourDrive
|
f27412a201
|
Merge pull request #1 from CrazyPants/1.7
June03 update from original
|
2014-06-01 17:40:24 -04:00 |
|
CrazyPants
|
b21ba7ab06
|
Merge pull request #719 from VapourDrive/1.7
Fixed the recipe output for advanced solar panel in hard mode
|
2014-05-30 12:24:27 +08:00 |
|
VapourDrive
|
31f3cb8230
|
Fixed the recipe output for advanced solar panel in hard mode
|
2014-05-30 00:13:46 -04:00 |
|
CrazyPants
|
0fe49bcc62
|
Merge pull request #718 from VapourDrive/1.7
Cleaned up Config subsets and grammer
|
2014-05-30 11:55:20 +08:00 |
|
CrazyPants
|
ef04a4148c
|
Zombie gen is done!
|
2014-05-31 00:25:14 +08:00 |
|
CrazyPants
|
2775279854
|
Added zombie head generator.
|
2014-05-30 22:54:46 +08:00 |
|
CrazyPants
|
0faf8857f2
|
moved generators into their own package
|
2014-05-30 19:32:57 +08:00 |
|
VapourDrive
|
5684a57d91
|
Cleaned up Config subsets and grammer
|
2014-05-29 23:45:26 -04:00 |
|
CrazyPants
|
0e46fec486
|
Merge pull request #716 from Jodell88/1.7
Method typo fixes
|
2014-05-29 19:28:36 +08:00 |
|
CrazyPants
|
895ecd54e5
|
All harvest operations now require and damage a tool (either hoe or axe)
|
2014-05-30 10:26:14 +08:00 |
|
CrazyPants
|
e78a6080df
|
Update to tree harvesting: add apple drops, harvests from the top so you dont wnd up with 'standed blocks' if the axe runs out mid way through a tree.
|
2014-05-30 10:03:45 +08:00 |
|
CrazyPants
|
7878789e3b
|
Added recipe for crafter.
|
2014-05-29 18:54:29 +08:00 |
|
CrazyPants
|
d1559e10a7
|
updated crafter textures.
|
2014-05-29 17:47:46 +08:00 |
|