From 5af3720fa237461da0b1c3b36d801909cc54da5f Mon Sep 17 00:00:00 2001 From: Citali Date: Tue, 21 Apr 2020 11:49:09 +0200 Subject: [PATCH 1/3] Removed clay compatingRule from config due to redundancy --- config/storagedrawers-common.toml | 2 +- usercache.json | 1 + usernamecache.json | 3 +++ 3 files changed, 5 insertions(+), 1 deletion(-) create mode 100644 usercache.json create mode 100644 usernamecache.json diff --git a/config/storagedrawers-common.toml b/config/storagedrawers-common.toml index d1a0289..b6330b2 100644 --- a/config/storagedrawers-common.toml +++ b/config/storagedrawers-common.toml @@ -14,7 +14,7 @@ debugTrace = false #List of rules in format "domain:item1, domain:item2, n". #Causes a compacting drawer convert n of item1 into 1 of item2. - compactingRules = ["minecraft:clay, minecraft:clay_ball, 4"] + compactingRules = [] [StorageUpgrades] #Storage upgrades multiply storage capacity by the given amount. diff --git a/usercache.json b/usercache.json new file mode 100644 index 0000000..c26c656 --- /dev/null +++ b/usercache.json @@ -0,0 +1 @@ +[{"name":"Citali","uuid":"87c0acc6-ec6e-4456-b256-b871edc60813","expiresOn":"2020-05-21 11:45:00 +0200"}] \ No newline at end of file diff --git a/usernamecache.json b/usernamecache.json new file mode 100644 index 0000000..26a711d --- /dev/null +++ b/usernamecache.json @@ -0,0 +1,3 @@ +{ + "87c0acc6-ec6e-4456-b256-b871edc60813": "Citali" +} \ No newline at end of file From 381105e959eb9c9dd27cf1c8253e8b0f82c9b157 Mon Sep 17 00:00:00 2001 From: Skeltoras Date: Tue, 21 Apr 2020 10:05:53 +0000 Subject: [PATCH 2/3] Revert "Merge branch '5-storage-drawers' into 'master'" This reverts merge request !10 --- config/storagedrawers-common.toml | 6 ------ usercache.json | 1 - usernamecache.json | 3 --- 3 files changed, 10 deletions(-) delete mode 100644 usercache.json delete mode 100644 usernamecache.json diff --git a/config/storagedrawers-common.toml b/config/storagedrawers-common.toml index 81311a0..06afa69 100644 --- a/config/storagedrawers-common.toml +++ b/config/storagedrawers-common.toml @@ -15,12 +15,6 @@ #Range: 1 ~ 50 controllerRange = 12 enableSidedOutput = true - enableItemConversion = true - enableExtraCompactingRules = true - debugTrace = false - #List of rules in format "domain:item1, domain:item2, n". - #Causes a compacting drawer convert n of item1 into 1 of item2. - compactingRules = [] [StorageUpgrades] level2Mult = 4 diff --git a/usercache.json b/usercache.json deleted file mode 100644 index c26c656..0000000 --- a/usercache.json +++ /dev/null @@ -1 +0,0 @@ -[{"name":"Citali","uuid":"87c0acc6-ec6e-4456-b256-b871edc60813","expiresOn":"2020-05-21 11:45:00 +0200"}] \ No newline at end of file diff --git a/usernamecache.json b/usernamecache.json deleted file mode 100644 index 26a711d..0000000 --- a/usernamecache.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "87c0acc6-ec6e-4456-b256-b871edc60813": "Citali" -} \ No newline at end of file From 947f5213a46b574bcd0638da4b2783935ade10ae Mon Sep 17 00:00:00 2001 From: Citali Date: Tue, 21 Apr 2020 12:12:27 +0200 Subject: [PATCH 3/3] Removed clay compatingRule from config due to redundancy --- config/storagedrawers-common.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/storagedrawers-common.toml b/config/storagedrawers-common.toml index 06afa69..4f2e445 100644 --- a/config/storagedrawers-common.toml +++ b/config/storagedrawers-common.toml @@ -2,7 +2,7 @@ [General] #List of rules in format "domain:item1, domain:item2, n". #Causes a compacting drawer convert n of item1 into 1 of item2. - compactingRules = ["minecraft:clay, minecraft:clay_ball, 4"] + compactingRules = [] enableUI = true debugTrace = false enableItemConversion = true