dave/refinedstorage
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
2,334 Commits 2 Branches 0 Tags
a08784e16db6324e59731f696155d02e02b2a75c
Commit Graph

2334 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
way2muchnoise
4faea84289 ICraftingPreviewElement uses IElementDrawers now 
and some fixes for autocrafting ofc
 2016-10-19 21:18:24 +02:00
Raoul Van den Berge
8a7f301abc Better crafting monitor element for machines in use / machine not found 2016-10-19 19:00:55 +02:00
way2muchnoise
a4b859764a fixes some issues with IProcessable and machines 2016-10-19 17:56:31 +02:00
Raoul Van den Berge
81c099f63c Minor fixes 2016-10-19 15:42:39 +02:00
Raoul Van den Berge
d27fd6af0e Merge remote-tracking branch 'origin/mc1.10' into mc1.10 2016-10-18 22:57:02 +02:00
Raoul Van den Berge
1c7bcd7458 Machines in use, doesn't work yet 2016-10-18 22:56:39 +02:00
way2muchnoise
1c94e3f9b5 enable depth when drawing items in the preview 2016-10-18 21:32:59 +02:00
way2muchnoise
8d29dc389a fix NPE due to IComparer mismatch during calculation 2016-10-18 21:30:45 +02:00
Raoul Van den Berge
e5ac59dc9a Send crafting monitor updates 2016-10-17 22:47:18 +02:00
Raoul Van den Berge
a41b1ee7c2 Crafting task persistence. Untested 2016-10-17 22:42:33 +02:00
Raoul Van den Berge
a8a4ea9c02 Added ore dictionary compare toggle to storage I/O blocks 2016-10-17 21:50:25 +02:00
way2muchnoise
3bf55346fe static finals need to be capitalized 2016-10-17 21:00:09 +02:00
way2muchnoise
bc98808ad2 fixes for autocrafting related to the ore dict 2016-10-17 20:57:57 +02:00
Raoul
5480640c49 Update CHANGELOG.md 2016-10-17 18:57:58 +02:00
Modmuss50
5293cc45fd Allow placing of skulls (#480) 
* Allow placing of skulls

* Fix incorrect position when checking wither spawn

* Fix rotation, and format with idea's default formatter.
 2016-10-17 18:52:00 +02:00
Raoul Van den Berge
074c11d78d Merge remote-tracking branch 'origin/mc1.10' into mc1.10 2016-10-16 22:35:57 +02:00
Raoul Van den Berge
25017ddc62 Fix inputs null stuff 2016-10-16 22:35:48 +02:00
InusualZ
7d4a0a9818 Lock access type for Extra Utilities 2 Trash Can (#478) 
* Lock access type for Extra Utilities 2 Trash Can

* Another approach

* Forgot to delete NBT Tag
 2016-10-16 22:31:03 +02:00
way2muchnoise
a6fcf79917 Render improvements for CraftingMonitorElements and CraftingPreviewElements (#477) 
* add fluids to the preview and tons of fixes regarding the rendering of CraftingMonitorElements and CraftingPreviewElements

* name changes to please @raoulvdberge
 2016-10-16 22:09:37 +02:00
Raoul Van den Berge
da14791814 Add utils methods for reading and writing item and fluidstacks 2016-10-16 19:47:05 +02:00
Raoul Van den Berge
d201092416 Added method to send crafting monitor update. It's no longer being sent every tick. Crafting tasks need to call this accordingly. 2016-10-16 19:35:50 +02:00
Raoul Van den Berge
cd27a40b53 Fix textures 2016-10-16 19:31:06 +02:00
Raoul Van den Berge
114188d969 Remove ServerProxy 2016-10-16 19:23:34 +02:00
Raoul
894419700a Update CHANGELOG.md 2016-10-16 19:08:23 +02:00
Raoul
9c981f5529 Update CHANGELOG.md 2016-10-16 19:03:45 +02:00
InusualZ
ae2738b805 Fortune Upgrade (#475) 
* Fortune Upgrade mechanic

* Implemented upgrade tooltip and a couple of fix

* Use the tooltip instead of doing a special name

* Add the crafting recipe for the upgrade

* Item tooltip localization
 2016-10-16 19:03:20 +02:00
way2muchnoise
6645f41db7 rewrite most the autocraft calculations (#472) 
* rewrite most the autocraft calculations, mainly to improve the preview generation

* fix impl being in the api and general code style

* fix code style

* remove breakpoint line
 2016-10-15 23:59:48 +02:00
Raoul
de08257f99 Update CHANGELOG.md 2016-10-15 23:52:27 +02:00
InusualZ
28993a4a59 Silk Touch Upgrade for the Destructor (#471) 
* Silk Touch Upgrade for the Destructor

* Removed unused imports

* Naming Convention

* Get enchant by string id

* Moved if

* Forgot to add the renamed files and fix some coding style

* Unused statement

* Remove unused var
 2016-10-15 23:51:27 +02:00
Raoul Van den Berge
086adaa57a Added helpful tooltip to wireless transmitter 2016-10-14 23:54:44 +02:00
Raoul Van den Berge
20a1cde52b Fixed glitchy rendering of cable parts in item form 2016-10-14 23:47:43 +02:00
Raoul Van den Berge
e76851089e Add header txt so access type sidebutton 2016-10-14 23:41:01 +02:00
Raoul Van den Berge
a06d163575 Storage disks and storage blocks now don't despawn anymore when dropped in the world 2016-10-14 23:00:47 +02:00
Raoul Van den Berge
15442d8603 Update changelog 2016-10-14 22:57:44 +02:00
InusualZ
206f909478 Destructor can now pickup item from the world (#465) 
* Destructor can now pickup item from the world

* Forgot to add the SideButton file & fixed a couple of things

* Insert only if the network can accept the whole stack

* ...
 2016-10-14 22:52:32 +02:00
Raoul Van den Berge
a4374ee065 Merge remote-tracking branch 'origin/mc1.10' into mc1.10 2016-10-14 08:57:20 +02:00
Raoul Van den Berge
b5a5d9beea Fix incorrect read/write 2016-10-14 08:56:53 +02:00
InusualZ
22e07a725a Fullness detection when crafting (#462) 
* Fullness detection when crafting

* Var renaming and use player position...

* Ups
 2016-10-13 18:59:47 +02:00
Raoul Van den Berge
6807e780c2 Fixed when shift clicking crafting recipe and inventory is full items are dropping on the ground instead of going in the system, fixes #439 2016-10-12 16:12:53 +02:00
Raoul Van den Berge
9b4a5b3ece Fixed External Storage crafting recipe not supporting ore dictionary chests, fixes #457 2016-10-12 16:04:28 +02:00
Raoul
c4df3fed22 Update CHANGELOG.md 2016-10-12 14:16:51 +02:00
InusualZ
73f3d14a20 Fixed Disk Manipulator blocking items transferring in some cases (#458) 
* Fixed Disk Manipulator blocking items transferring in some cases

* One item per iteration
 2016-10-12 14:15:47 +02:00
Raoul Van den Berge
09756906d0 Show items inserting at end of crafting task 2016-10-11 22:54:53 +02:00
Raoul Van den Berge
f19c78ce0d Add crafting task cancelling 2016-10-11 22:16:18 +02:00
Raoul Van den Berge
e5d9a9f0d9 Merge remote-tracking branch 'origin/mc1.10' into mc1.10 2016-10-11 22:11:18 +02:00
Raoul Van den Berge
5ccd3dfe2e Give back correct items on oredict craft 2016-10-11 22:11:06 +02:00
Raoul
f8d3bea7a8 Update CHANGELOG.md 2016-10-11 20:01:21 +02:00
geldorn
5759d9276d Fix for void upgraded storage drawers using the previous developed void handling. (#454) 
* Fixed void storage drawers and simplified storage drawer handling code.

* Coding style correction.
 2016-10-11 20:00:14 +02:00
Raoul Van den Berge
cd3bd045c3 Update changelog 2016-10-11 01:45:14 +02:00
Raoul Van den Berge
ccbb41b45b Fix build 2016-10-11 01:43:42 +02:00