Commit Graph

2373 Commits

Author SHA1 Message Date
Raoul Van den Berge
bdb1c64a78 New art by CyanideX 2016-09-27 22:32:28 +02:00
Raoul Van den Berge
4e3efda847 Actually, let's call this version 1.1 2016-09-27 18:44:03 +02:00
Raoul Van den Berge
398f9c1ca8 Constructor / Destructor have a connected state 2016-09-27 18:39:10 +02:00
Raoul Van den Berge
5e111c8dd4 Update changelog 2016-09-27 17:09:58 +02:00
Raoul Van den Berge
6a947dadb8 Merge remote-tracking branch 'origin/mc1.10' into mc1.10
# Conflicts:
#	CHANGELOG.md
2016-09-27 17:09:17 +02:00
Raoul Van den Berge
fe8de80ca3 Fixed autocrafting not giving back byproducts, fixes #390 2016-09-27 17:08:41 +02:00
Raoul
acce6a7c9c More prominent 2016-09-27 12:49:16 +02:00
Raoul Van den Berge
b4fe9164c3 Disk Manipulator now has a front texture and connected state 2016-09-26 21:19:33 +02:00
Raoul Van den Berge
0488e03754 Update changelog 2016-09-26 20:08:42 +02:00
Raoul Van den Berge
32a413a357 Merge remote-tracking branch 'origin/mc1.10' into mc1.10 2016-09-26 19:37:35 +02:00
Raoul Van den Berge
e952e13734 Fix solderer model 2016-09-26 19:37:21 +02:00
Raoul
d0fc404fb0 Merge pull request #387 from way2muchnoise/mc1.10
fixes #386
2016-09-26 19:03:23 +02:00
way2muchnoise
7f973f5537 fixes #386 2016-09-26 18:58:03 +02:00
Raoul Van den Berge
c9a9c52e3b New solderer model 2016-09-26 18:01:28 +02:00
Raoul Van den Berge
72fde5ce31 Blockstates for disk drive slots 2016-09-26 00:01:00 +02:00
Raoul Van den Berge
8ba64dffab Every machine now compares on damage and NBT by default 2016-09-25 23:13:34 +02:00
Raoul
2234003b32 Update CHANGELOG.md 2016-09-25 19:30:03 +02:00
Raoul
232a0b64c8 Merge pull request #385 from way2muchnoise/mc1.10
update JEI to 3.11.+
2016-09-25 19:28:53 +02:00
way2muchnoise
87320d78f7 update JEI to 3.11.+
the ingredients overhaul
2016-09-25 18:07:17 +02:00
Raoul
bf68c9f092 Merge pull request #382 from way2muchnoise/mc1.10
Crafting Preview does loop checks now
2016-09-25 17:31:42 +02:00
way2muchnoise
e016683c19 some performance enhancement to loop checks in the preview 2016-09-25 17:27:03 +02:00
way2muchnoise
67075b38e0 improves preview when there is loops in the crafting task 2016-09-25 17:16:17 +02:00
Raoul Van den Berge
6dec24edc9 Add missing annotations 2016-09-25 15:24:21 +02:00
Raoul Van den Berge
8018c8d559 Added helpful tooltips to Solderer and Processing Pattern Encoder 2016-09-25 14:57:58 +02:00
Raoul Van den Berge
0a89d0318f Added max crafting task depth 2016-09-25 11:31:53 +02:00
Raoul Van den Berge
dd1e20374a Solderer fixes 2016-09-25 10:37:55 +02:00
Raoul
9d85708d35 Merge pull request #380 from way2muchnoise/mc1.10
don't check network for requested craft
2016-09-24 12:19:35 +02:00
way2muchnoise
f01309a605 don't check network for requested craft 2016-09-24 11:45:03 +02:00
Raoul Van den Berge
f75df4bfa3 Fix wrong constant 2016-09-22 20:34:32 +02:00
Raoul Van den Berge
af442dba4f GUI tweaks to crafting preview 2016-09-22 20:31:57 +02:00
Raoul Van den Berge
dbcd29b9e9 Coding style / naming fixes 2016-09-22 16:38:08 +02:00
Raoul
283bca855e Merge pull request #374 from way2muchnoise/mc1.10
add crafting preview
2016-09-22 08:12:26 +02:00
way2muchnoise
10788d25b5 add crafting preview 2016-09-21 23:16:02 +02:00
Raoul Van den Berge
5a3d6e5db2 Version bump to 1.0.6 2016-09-21 18:33:32 +02:00
Raoul Van den Berge
f51c218ea5 Changed default Grid sorting type to quantity 2016-09-21 17:43:34 +02:00
Raoul Van den Berge
41bdbad10d Add disk manipulator texture 2016-09-21 17:42:27 +02:00
Raoul
90c7420851 Update CHANGELOG.md 2016-09-21 13:21:18 +02:00
Raoul
77c8ae629c Merge pull request #372 from TartaricAcid/mc1.10
Update zh_CN language file
2016-09-21 13:20:48 +02:00
TartaricAcid
b9033abaa6 Update zh_CN language file 2016-09-21 16:08:32 +08:00
Raoul Van den Berge
39ea673a34 Update changelog 2016-09-20 22:21:32 +02:00
Raoul Van den Berge
fd0fa628a3 Remove unneeded method 2016-09-20 22:15:48 +02:00
Raoul Van den Berge
35e6dc7b18 Remove ore dict support. Lots of pain for very little gain. 2016-09-20 22:13:44 +02:00
Raoul Van den Berge
6e63cf368e Also fix the bug in fluid interface, fixes #369 2016-09-20 18:09:58 +02:00
Raoul Van den Berge
26871e7880 Added the ability to see the output of a Pattern by shift clicking 2016-09-20 18:03:54 +02:00
Raoul Van den Berge
4323f872cf Exporter in fluid mode no longer duplicates fluids that are less than 1 bucket, fixes #369 2016-09-20 17:22:40 +02:00
Raoul Van den Berge
a16898231a Improve redstone mode persistance 2016-09-20 16:48:50 +02:00
Raoul Van den Berge
c8a42e29b3 Fixes and stuff and things (too lazy to write a commit message but not lazy to write this long sentence) 2016-09-20 16:16:26 +02:00
Raoul Van den Berge
d3d3381620 Fix broken check 2016-09-20 15:55:43 +02:00
Raoul Van den Berge
d7502df445 When a machine is in use by a crafting pattern, inserting of items from other patterns will be avoided, fixes #367 2016-09-19 18:06:40 +02:00
Raoul Van den Berge
c00762b16e Importer now takes a Destruction Core, and Exporter a Construction Core, fixes #365 2016-09-18 23:47:59 +02:00