Raoul Van den Berge
|
af8c25dcfa
|
Merge remote-tracking branch 'origin/mc1.10' into mc1.10
|
2016-09-18 22:38:33 +02:00 |
|
Raoul Van den Berge
|
fd629d16aa
|
Update changelog
|
2016-09-18 22:38:15 +02:00 |
|
Raoul
|
7e8c5a2b7a
|
Merge pull request #363 from way2muchnoise/mc1.10
Add ingame config
|
2016-09-18 22:37:46 +02:00 |
|
way2muchnoise
|
b594b52aa6
|
make config non-static
|
2016-09-18 22:30:09 +02:00 |
|
way2muchnoise
|
5cfe09282f
|
add ingame config
|
2016-09-18 22:27:12 +02:00 |
|
Raoul
|
429bce4148
|
Merge pull request #362 from way2muchnoise/mc1.10
Add upgrades and power usage to the Disk Manipulator
|
2016-09-18 21:48:41 +02:00 |
|
way2muchnoise
|
c814e009ea
|
code style and energy usage
|
2016-09-18 21:40:55 +02:00 |
|
way2muchnoise
|
1e85518d14
|
add upgrades to the manipulator
|
2016-09-18 21:33:59 +02:00 |
|
Raoul Van den Berge
|
d26706057e
|
Updated Dutch translation
|
2016-09-18 20:56:35 +02:00 |
|
Raoul Van den Berge
|
be808d4ff8
|
Updated changelog, removed manipulator toggle constant, fixed sidebutton offset, added recipe for manipulator, small formatting fixes
|
2016-09-18 19:24:55 +02:00 |
|
Raoul
|
d686b83f60
|
Merge pull request #360 from way2muchnoise/mc1.10
Finish Disk Manipulator
|
2016-09-18 15:28:39 +02:00 |
|
way2muchnoise
|
9cfb33c805
|
improve style
begone comments
|
2016-09-18 15:21:57 +02:00 |
|
way2muchnoise
|
423ecee099
|
add extraction from network to manipulator
also some small consistency change
|
2016-09-18 15:09:03 +02:00 |
|
Raoul Van den Berge
|
24d9b19824
|
Give correct byproducts back
|
2016-09-18 02:04:54 +02:00 |
|
Raoul Van den Berge
|
a1e524dd27
|
Add translation keys
|
2016-09-17 23:14:59 +02:00 |
|
Raoul Van den Berge
|
134780bdc0
|
Add oredict button to processing pattern encoder
|
2016-09-17 23:11:17 +02:00 |
|
Raoul Van den Berge
|
488ce3e600
|
Add oredict button to grid
|
2016-09-17 22:42:19 +02:00 |
|
Raoul Van den Berge
|
f49fc23716
|
Add base code for oredict item retrieval, #356
|
2016-09-17 21:47:42 +02:00 |
|
Raoul Van den Berge
|
dfa217660c
|
Merge remote-tracking branch 'origin/mc1.10' into mc1.10
|
2016-09-17 19:07:26 +02:00 |
|
Raoul Van den Berge
|
da186bba5a
|
Fixed thing not working
|
2016-09-17 19:06:55 +02:00 |
|
Raoul Van den Berge
|
9b576cd938
|
Fixed shift clicking from Grid when player inventory is full throwing items in the world, fixes #355
|
2016-09-17 18:20:31 +02:00 |
|
Raoul Van den Berge
|
80cf5a08b0
|
Fixed crafting a complex item causes the process to flow off the Crafting Monitor's GUI, fixes #354
|
2016-09-17 17:37:30 +02:00 |
|
Raoul Van den Berge
|
99870fbb0b
|
Bump to 1.0.5
|
2016-09-17 17:35:42 +02:00 |
|
Raoul
|
39549ddfcd
|
Merge pull request #353 from way2muchnoise/mc1.10
add NBTStorage util class
|
2016-09-17 15:10:37 +02:00 |
|
way2muchnoise
|
680c45da7e
|
code style updates
|
2016-09-17 15:09:38 +02:00 |
|
way2muchnoise
|
cba0e4af26
|
add some default IItemValidator implementations
|
2016-09-17 15:06:13 +02:00 |
|
Raoul Van den Berge
|
02fbb14c2f
|
Update changelog. 1.0.4 done
|
2016-09-17 15:04:32 +02:00 |
|
Raoul Van den Berge
|
fc9988e19e
|
Forge 2088 is a requirement
|
2016-09-17 15:02:56 +02:00 |
|
way2muchnoise
|
f9d192ce76
|
code style updates
|
2016-09-17 14:57:40 +02:00 |
|
way2muchnoise
|
6129420627
|
add NBTStorage util class
|
2016-09-17 14:53:51 +02:00 |
|
Raoul Van den Berge
|
3b27bef1f7
|
Ticks didn't get incremented clientside, so this condition was true forever. Fixes #340
|
2016-09-17 13:56:49 +02:00 |
|
Raoul Van den Berge
|
5ce4d7205b
|
Update docs
|
2016-09-17 13:47:31 +02:00 |
|
Raoul Van den Berge
|
d78005b2c2
|
Bump to 1.0.4
|
2016-09-17 13:46:10 +02:00 |
|
Raoul Van den Berge
|
b927490cb3
|
Remove solderer automation screenshot [ci skip]
|
2016-09-17 13:09:08 +02:00 |
|
Raoul Van den Berge
|
eeed721ffb
|
Fix solderer not dropping result
|
2016-09-17 12:50:27 +02:00 |
|
Raoul Van den Berge
|
946c629e12
|
Disable disk manip for now
|
2016-09-17 12:31:52 +02:00 |
|
Raoul Van den Berge
|
2d9ef15c60
|
Merge remote-tracking branch 'origin/mc1.10' into mc1.10
|
2016-09-17 12:19:45 +02:00 |
|
Raoul Van den Berge
|
c91f683f37
|
Fixed fluid autocrafting scheduling too much crafting tasks for buckets, fixes #351 and #352
|
2016-09-17 12:19:26 +02:00 |
|
Raoul
|
45e167ab70
|
Merge pull request #350 from way2muchnoise/mc1.10
Adds inserting into network for the Disk Manipulator
|
2016-09-17 11:38:53 +02:00 |
|
way2muchnoise
|
c8892ac9ee
|
fixes some minor issue and improves the code style
|
2016-09-17 01:08:41 +02:00 |
|
way2muchnoise
|
48b3e7a0bb
|
adds inserting into the network for the Disk Manipulator
I know, there must be a better way
|
2016-09-17 00:45:57 +02:00 |
|
Raoul Van den Berge
|
aaad4e0d6e
|
Fix some model stuff
|
2016-09-16 23:13:37 +02:00 |
|
Raoul Van den Berge
|
670ee56dd0
|
Only rebuild patterns on the server, #340
|
2016-09-16 21:35:03 +02:00 |
|
Raoul Van den Berge
|
c7f35257f3
|
Move SoldererRecipe to API pkg
|
2016-09-16 21:32:36 +02:00 |
|
Raoul Van den Berge
|
a749875137
|
Changed recipe for upgrades in the Solderer, they now just take 1 of the unique item instead of 2, fixes #349
|
2016-09-16 21:29:36 +02:00 |
|
Raoul Van den Berge
|
afd1b8819a
|
Added integration for Forge energy
|
2016-09-16 21:07:36 +02:00 |
|
Raoul Van den Berge
|
c90450ebde
|
Update forge and deps
|
2016-09-16 20:57:19 +02:00 |
|
Raoul Van den Berge
|
667bcef351
|
Also care about oredict
|
2016-09-16 02:41:42 +02:00 |
|
Raoul Van den Berge
|
1f489a63ee
|
Solderer improvements, fixes #345
|
2016-09-16 02:27:29 +02:00 |
|
Raoul Van den Berge
|
63552d87f7
|
Fix bad logic in network node graph
|
2016-09-16 02:05:22 +02:00 |
|