From 277ae83826121c676754208bd61467bbea245a85 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20L=C3=B8vbr=C3=B8tte=20Olsen?= Date: Wed, 22 May 2019 01:06:22 +0000 Subject: [PATCH 01/28] Deleted MC-001_disable_vanilla/data/minecraft/recipes/stone_slab.json, MC-001_disable_vanilla/pack.mcmeta files --- .../data/minecraft/recipes/stone_slab.json | 1 - MC-001_disable_vanilla/pack.mcmeta | 6 ------ 2 files changed, 7 deletions(-) delete mode 100644 MC-001_disable_vanilla/data/minecraft/recipes/stone_slab.json delete mode 100755 MC-001_disable_vanilla/pack.mcmeta diff --git a/MC-001_disable_vanilla/data/minecraft/recipes/stone_slab.json b/MC-001_disable_vanilla/data/minecraft/recipes/stone_slab.json deleted file mode 100644 index 9e26dfe..0000000 --- a/MC-001_disable_vanilla/data/minecraft/recipes/stone_slab.json +++ /dev/null @@ -1 +0,0 @@ -{} \ No newline at end of file diff --git a/MC-001_disable_vanilla/pack.mcmeta b/MC-001_disable_vanilla/pack.mcmeta deleted file mode 100755 index 26cd3cd..0000000 --- a/MC-001_disable_vanilla/pack.mcmeta +++ /dev/null @@ -1,6 +0,0 @@ -{ - "pack": { - "pack_format": 1, - "description": "MC-001, disables vanilla stone to smooth stone slabs" - } -} From 9259934e62f9d3f90aaace92364d1223dd380546 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20L=C3=B8vbr=C3=B8tte=20Olsen?= Date: Wed, 22 May 2019 01:12:26 +0000 Subject: [PATCH 02/28] Update README.md --- README.md | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 147b68e..30c4dbf 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,14 @@ # Minecraft Datapacks -Datapacks for minecraft \ No newline at end of file +Datapacks for minecraft + +## Steps to change datapacks + +Fixes can go straight to master, all other changes are to be done like the following: + +1. Write up a proposal for what to change on wiki.dodsorf.as +2. Get feedback +3. Branch from master and add/change datapacks needed to fix in that branch. +4. TEST +5. Enter final comment period for the MC, no major changes unless its a really good idea +6. merge to master \ No newline at end of file From 334d25619c526fd5f9205ea9c9c23c3492a5a899 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20L=C3=B8vbr=C3=B8tte=20Olsen?= Date: Wed, 22 May 2019 01:17:45 +0000 Subject: [PATCH 03/28] Update .gitlab-ci.yml --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a45e98e..df44215 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -14,7 +14,7 @@ build: stage: build script: - mkdir out - - find . -maxdepth 1 -type d -not -name ".git" -not -name "out" -not -name "." | xargs -I {} zip -r out/{} {} + - find . -maxdepth 1 -type d -not -name ".git" -not -name "out" -not -name "." | xargs -I {} zip -r out/{} {}/\* artifacts: paths: - ./out \ No newline at end of file From e56b81de98feca2df4544cfb46ffe252a767f060 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20L=C3=B8vbr=C3=B8tte=20Olsen?= Date: Wed, 22 May 2019 01:19:40 +0000 Subject: [PATCH 04/28] Update .gitlab-ci.yml --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index df44215..7a83554 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -14,7 +14,7 @@ build: stage: build script: - mkdir out - - find . -maxdepth 1 -type d -not -name ".git" -not -name "out" -not -name "." | xargs -I {} zip -r out/{} {}/\* + - find -maxdepth 1 -type d -not -name ".git" -not -name "out" -not -name "." | xargs -I {} zip -r out/{} {}/* artifacts: paths: - ./out \ No newline at end of file From 2fdec1a547514f71764a94135c447e2fc1ce8ac5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20L=C3=B8vbr=C3=B8tte=20Olsen?= Date: Wed, 22 May 2019 01:20:29 +0000 Subject: [PATCH 05/28] Update .gitlab-ci.yml --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 7a83554..ca2053c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -14,7 +14,7 @@ build: stage: build script: - mkdir out - - find -maxdepth 1 -type d -not -name ".git" -not -name "out" -not -name "." | xargs -I {} zip -r out/{} {}/* + - find -maxdepth 1 -type d -not -name ".git" -not -name "out" -not -name "." | xargs -I {} zip -r out/{} {}/\* artifacts: paths: - ./out \ No newline at end of file From 30dcfd112e5891ae4290cd5db62dda05f0ec4c8b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20L=C3=B8vbr=C3=B8tte=20Olsen?= Date: Wed, 22 May 2019 01:22:14 +0000 Subject: [PATCH 06/28] Update .gitlab-ci.yml --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ca2053c..06d39d5 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -14,7 +14,7 @@ build: stage: build script: - mkdir out - - find -maxdepth 1 -type d -not -name ".git" -not -name "out" -not -name "." | xargs -I {} zip -r out/{} {}/\* + - find -maxdepth 1 -type d -not -name ".git" -not -name "out" -not -name "." | xargs -I {} zip -r out/{}.zip {}/* artifacts: paths: - ./out \ No newline at end of file From 35ae220f5e8b903876167f122e4405dcf670efc3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20L=C3=B8vbr=C3=B8tte=20Olsen?= Date: Wed, 22 May 2019 01:26:47 +0000 Subject: [PATCH 07/28] Update .gitlab-ci.yml --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 06d39d5..06b3b31 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -14,7 +14,7 @@ build: stage: build script: - mkdir out - - find -maxdepth 1 -type d -not -name ".git" -not -name "out" -not -name "." | xargs -I {} zip -r out/{}.zip {}/* + - find -maxdepth 1 -type d -not -name ".git" -not -name "out" -not -name "." | xargs -I {} zip -r out/{} {} -i {}\* artifacts: paths: - ./out \ No newline at end of file From b2ba9157b205d26343463480a7d29e5d81f3ac20 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20L=C3=B8vbr=C3=B8tte=20Olsen?= Date: Wed, 22 May 2019 01:47:36 +0000 Subject: [PATCH 08/28] Update .gitlab-ci.yml --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 06b3b31..3eac540 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -14,7 +14,7 @@ build: stage: build script: - mkdir out - - find -maxdepth 1 -type d -not -name ".git" -not -name "out" -not -name "." | xargs -I {} zip -r out/{} {} -i {}\* + - find -maxdepth 1 -type d -not -name ".git" -not -name "out" -not -name "." | xargs -I '{}' bash -c '(cd {} && zip -r ../out/{} .)' artifacts: paths: - ./out \ No newline at end of file From 3f0e136b9400049d646eef67eb06a2aba486acf2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20L=C3=B8vbr=C3=B8tte=20Olsen?= Date: Wed, 22 May 2019 01:49:39 +0000 Subject: [PATCH 09/28] Update .gitlab-ci.yml --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 3eac540..7dc29ba 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -14,7 +14,7 @@ build: stage: build script: - mkdir out - - find -maxdepth 1 -type d -not -name ".git" -not -name "out" -not -name "." | xargs -I '{}' bash -c '(cd {} && zip -r ../out/{} .)' + - find -maxdepth 1 -type d -not -name ".git" -not -name "out" -not -name "." | xargs -I '{}' bash -c 'cd {} && zip -r ../out/{} .' artifacts: paths: - ./out \ No newline at end of file From f767a49977cef83f05f3cbce23ab7bd205af4e63 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20L=C3=B8vbr=C3=B8tte=20Olsen?= Date: Wed, 22 May 2019 01:51:00 +0000 Subject: [PATCH 10/28] Update .gitlab-ci.yml --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 7dc29ba..ed3355f 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -14,7 +14,7 @@ build: stage: build script: - mkdir out - - find -maxdepth 1 -type d -not -name ".git" -not -name "out" -not -name "." | xargs -I '{}' bash -c 'cd {} && zip -r ../out/{} .' + - find -maxdepth 1 -type d -not -name ".git" -not -name "out" -not -name "." | xargs -I '{}' sh -c 'cd {} && zip -r ../out/{} .' artifacts: paths: - ./out \ No newline at end of file From a97ef160a11aa24b1e906ebb3ed1d2f96d5d70aa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20L=C3=B8vbr=C3=B8tte=20Olsen?= Date: Wed, 22 May 2019 10:12:04 +0000 Subject: [PATCH 11/28] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 30c4dbf..7ffaabd 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,7 @@ Datapacks for minecraft Fixes can go straight to master, all other changes are to be done like the following: -1. Write up a proposal for what to change on wiki.dodsorf.as +1. Write up a proposal for what to change as an issue 2. Get feedback 3. Branch from master and add/change datapacks needed to fix in that branch. 4. TEST From 74daed8197119396f969472736bc4dc6c2ba6f2b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20L=C3=B8vbr=C3=B8tte=20Olsen?= Date: Thu, 23 May 2019 09:20:51 +0000 Subject: [PATCH 12/28] remove custom wool tag Was this added to vanilla in 1.13? --- .../recipes/blue_wool_improved.json | 4 ++-- .../recipes/brown_wool_improved.json | 4 ++-- .../recipes/cyan_wool_improved.json | 4 ++-- .../recipes/gray_wool_improved.json | 4 ++-- .../recipes/green_wool_improved.json | 4 ++-- .../recipes/light_blue_wool_improved.json | 4 ++-- .../recipes/light_gray_wool_improved.json | 4 ++-- .../recipes/lime_wool_improved.json | 4 ++-- .../recipes/magenta_wool_improved.json | 4 ++-- .../recipes/orange_wool_improved.json | 4 ++-- .../recipes/pink_wool_improved.json | 4 ++-- .../recipes/purple_wool_improved.json | 4 ++-- .../recipes/red_wool_improved.json | 4 ++-- .../recipes/white_wool_improved.json | 4 ++-- .../recipes/yellow_wool_improved.json | 4 ++-- .../dodsorfas_recolor/tags/items/wool.json | 21 ------------------- 16 files changed, 30 insertions(+), 51 deletions(-) delete mode 100755 dodsorfas_colors/data/dodsorfas_recolor/tags/items/wool.json diff --git a/dodsorfas_colors/data/dodsorfas_recolor/recipes/blue_wool_improved.json b/dodsorfas_colors/data/dodsorfas_recolor/recipes/blue_wool_improved.json index 1272d50..321ee43 100755 --- a/dodsorfas_colors/data/dodsorfas_recolor/recipes/blue_wool_improved.json +++ b/dodsorfas_colors/data/dodsorfas_recolor/recipes/blue_wool_improved.json @@ -1,8 +1,8 @@ -{ +{ "type": "crafting_shapeless", "ingredients": [ { - "tag": "dodsorfas_recolor:wool" + "tag": "minecraft:wool" }, { "item": "minecraft:lapis_lazuli" diff --git a/dodsorfas_colors/data/dodsorfas_recolor/recipes/brown_wool_improved.json b/dodsorfas_colors/data/dodsorfas_recolor/recipes/brown_wool_improved.json index 48d1b6d..357ab3b 100755 --- a/dodsorfas_colors/data/dodsorfas_recolor/recipes/brown_wool_improved.json +++ b/dodsorfas_colors/data/dodsorfas_recolor/recipes/brown_wool_improved.json @@ -1,8 +1,8 @@ -{ +{ "type": "crafting_shapeless", "ingredients": [ { - "tag": "dodsorfas_recolor:wool" + "tag": "minecraft:wool" }, { "item": "minecraft:cocoa_beans" diff --git a/dodsorfas_colors/data/dodsorfas_recolor/recipes/cyan_wool_improved.json b/dodsorfas_colors/data/dodsorfas_recolor/recipes/cyan_wool_improved.json index 91ad633..cf3c240 100755 --- a/dodsorfas_colors/data/dodsorfas_recolor/recipes/cyan_wool_improved.json +++ b/dodsorfas_colors/data/dodsorfas_recolor/recipes/cyan_wool_improved.json @@ -1,8 +1,8 @@ -{ +{ "type": "crafting_shapeless", "ingredients": [ { - "tag": "dodsorfas_recolor:wool" + "tag": "minecraft:wool" }, { "item": "minecraft:cyan_dye" diff --git a/dodsorfas_colors/data/dodsorfas_recolor/recipes/gray_wool_improved.json b/dodsorfas_colors/data/dodsorfas_recolor/recipes/gray_wool_improved.json index 6a993ef..8837dff 100755 --- a/dodsorfas_colors/data/dodsorfas_recolor/recipes/gray_wool_improved.json +++ b/dodsorfas_colors/data/dodsorfas_recolor/recipes/gray_wool_improved.json @@ -1,8 +1,8 @@ -{ +{ "type": "crafting_shapeless", "ingredients": [ { - "tag": "dodsorfas_recolor:wool" + "tag": "minecraft:wool" }, { "item": "minecraft:gray_dye" diff --git a/dodsorfas_colors/data/dodsorfas_recolor/recipes/green_wool_improved.json b/dodsorfas_colors/data/dodsorfas_recolor/recipes/green_wool_improved.json index 845050b..5713d2c 100755 --- a/dodsorfas_colors/data/dodsorfas_recolor/recipes/green_wool_improved.json +++ b/dodsorfas_colors/data/dodsorfas_recolor/recipes/green_wool_improved.json @@ -1,8 +1,8 @@ -{ +{ "type": "crafting_shapeless", "ingredients": [ { - "tag": "dodsorfas_recolor:wool" + "tag": "minecraft:wool" }, { "item": "minecraft:cactus_green" diff --git a/dodsorfas_colors/data/dodsorfas_recolor/recipes/light_blue_wool_improved.json b/dodsorfas_colors/data/dodsorfas_recolor/recipes/light_blue_wool_improved.json index 1272d50..321ee43 100755 --- a/dodsorfas_colors/data/dodsorfas_recolor/recipes/light_blue_wool_improved.json +++ b/dodsorfas_colors/data/dodsorfas_recolor/recipes/light_blue_wool_improved.json @@ -1,8 +1,8 @@ -{ +{ "type": "crafting_shapeless", "ingredients": [ { - "tag": "dodsorfas_recolor:wool" + "tag": "minecraft:wool" }, { "item": "minecraft:lapis_lazuli" diff --git a/dodsorfas_colors/data/dodsorfas_recolor/recipes/light_gray_wool_improved.json b/dodsorfas_colors/data/dodsorfas_recolor/recipes/light_gray_wool_improved.json index 6a993ef..8837dff 100755 --- a/dodsorfas_colors/data/dodsorfas_recolor/recipes/light_gray_wool_improved.json +++ b/dodsorfas_colors/data/dodsorfas_recolor/recipes/light_gray_wool_improved.json @@ -1,8 +1,8 @@ -{ +{ "type": "crafting_shapeless", "ingredients": [ { - "tag": "dodsorfas_recolor:wool" + "tag": "minecraft:wool" }, { "item": "minecraft:gray_dye" diff --git a/dodsorfas_colors/data/dodsorfas_recolor/recipes/lime_wool_improved.json b/dodsorfas_colors/data/dodsorfas_recolor/recipes/lime_wool_improved.json index 794ab7b..fbe7f10 100755 --- a/dodsorfas_colors/data/dodsorfas_recolor/recipes/lime_wool_improved.json +++ b/dodsorfas_colors/data/dodsorfas_recolor/recipes/lime_wool_improved.json @@ -1,8 +1,8 @@ -{ +{ "type": "crafting_shapeless", "ingredients": [ { - "tag": "dodsorfas_recolor:wool" + "tag": "minecraft:wool" }, { "item": "minecraft:lime_dye" diff --git a/dodsorfas_colors/data/dodsorfas_recolor/recipes/magenta_wool_improved.json b/dodsorfas_colors/data/dodsorfas_recolor/recipes/magenta_wool_improved.json index eeffb99..7078479 100755 --- a/dodsorfas_colors/data/dodsorfas_recolor/recipes/magenta_wool_improved.json +++ b/dodsorfas_colors/data/dodsorfas_recolor/recipes/magenta_wool_improved.json @@ -1,8 +1,8 @@ -{ +{ "type": "crafting_shapeless", "ingredients": [ { - "tag": "dodsorfas_recolor:wool" + "tag": "minecraft:wool" }, { "item": "minecraft:magenta_dye" diff --git a/dodsorfas_colors/data/dodsorfas_recolor/recipes/orange_wool_improved.json b/dodsorfas_colors/data/dodsorfas_recolor/recipes/orange_wool_improved.json index 2af2d98..948c1be 100755 --- a/dodsorfas_colors/data/dodsorfas_recolor/recipes/orange_wool_improved.json +++ b/dodsorfas_colors/data/dodsorfas_recolor/recipes/orange_wool_improved.json @@ -1,8 +1,8 @@ -{ +{ "type": "crafting_shapeless", "ingredients": [ { - "tag": "dodsorfas_recolor:wool" + "tag": "minecraft:wool" }, { "item": "minecraft:orange_dye" diff --git a/dodsorfas_colors/data/dodsorfas_recolor/recipes/pink_wool_improved.json b/dodsorfas_colors/data/dodsorfas_recolor/recipes/pink_wool_improved.json index 179c91b..db515e4 100755 --- a/dodsorfas_colors/data/dodsorfas_recolor/recipes/pink_wool_improved.json +++ b/dodsorfas_colors/data/dodsorfas_recolor/recipes/pink_wool_improved.json @@ -1,8 +1,8 @@ -{ +{ "type": "crafting_shapeless", "ingredients": [ { - "tag": "dodsorfas_recolor:wool" + "tag": "minecraft:wool" }, { "item": "minecraft:pink_dye" diff --git a/dodsorfas_colors/data/dodsorfas_recolor/recipes/purple_wool_improved.json b/dodsorfas_colors/data/dodsorfas_recolor/recipes/purple_wool_improved.json index 3afc6c9..dd54eb7 100755 --- a/dodsorfas_colors/data/dodsorfas_recolor/recipes/purple_wool_improved.json +++ b/dodsorfas_colors/data/dodsorfas_recolor/recipes/purple_wool_improved.json @@ -1,8 +1,8 @@ -{ +{ "type": "crafting_shapeless", "ingredients": [ { - "tag": "dodsorfas_recolor:wool" + "tag": "minecraft:wool" }, { "item": "minecraft:purple_dye" diff --git a/dodsorfas_colors/data/dodsorfas_recolor/recipes/red_wool_improved.json b/dodsorfas_colors/data/dodsorfas_recolor/recipes/red_wool_improved.json index 7137c39..6c2c721 100755 --- a/dodsorfas_colors/data/dodsorfas_recolor/recipes/red_wool_improved.json +++ b/dodsorfas_colors/data/dodsorfas_recolor/recipes/red_wool_improved.json @@ -1,8 +1,8 @@ -{ +{ "type": "crafting_shapeless", "ingredients": [ { - "tag": "dodsorfas_recolor:wool" + "tag": "minecraft:wool" }, { "item": "minecraft:rose_red" diff --git a/dodsorfas_colors/data/dodsorfas_recolor/recipes/white_wool_improved.json b/dodsorfas_colors/data/dodsorfas_recolor/recipes/white_wool_improved.json index fa7ca88..1a1299c 100755 --- a/dodsorfas_colors/data/dodsorfas_recolor/recipes/white_wool_improved.json +++ b/dodsorfas_colors/data/dodsorfas_recolor/recipes/white_wool_improved.json @@ -1,8 +1,8 @@ -{ +{ "type": "crafting_shapeless", "ingredients": [ { - "tag": "dodsorfas_recolor:wool" + "tag": "minecraft:wool" }, { "item": "minecraft:bone_meal" diff --git a/dodsorfas_colors/data/dodsorfas_recolor/recipes/yellow_wool_improved.json b/dodsorfas_colors/data/dodsorfas_recolor/recipes/yellow_wool_improved.json index c24263e..d09ae80 100755 --- a/dodsorfas_colors/data/dodsorfas_recolor/recipes/yellow_wool_improved.json +++ b/dodsorfas_colors/data/dodsorfas_recolor/recipes/yellow_wool_improved.json @@ -1,8 +1,8 @@ -{ +{ "type": "crafting_shapeless", "ingredients": [ { - "tag": "dodsorfas_recolor:wool" + "tag": "minecraft:wool" }, { "item": "minecraft:dandelion_yellow" diff --git a/dodsorfas_colors/data/dodsorfas_recolor/tags/items/wool.json b/dodsorfas_colors/data/dodsorfas_recolor/tags/items/wool.json deleted file mode 100755 index c39732f..0000000 --- a/dodsorfas_colors/data/dodsorfas_recolor/tags/items/wool.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "replace": false, - "values": [ - "minecraft:white_wool", - "minecraft:orange_wool", - "minecraft:magenta_wool", - "minecraft:light_blue_wool", - "minecraft:yellow_wool", - "minecraft:lime_wool", - "minecraft:pink_wool", - "minecraft:gray_wool", - "minecraft:light_gray_wool", - "minecraft:cyan_wool", - "minecraft:purple_wool", - "minecraft:blue_wool", - "minecraft:brown_wool", - "minecraft:green_wool", - "minecraft:red_wool", - "minecraft:black_wool" - ] -} \ No newline at end of file From 282579e37280f69271297a1ca418a17ebe004cc5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20L=C3=B8vbr=C3=B8tte=20Olsen?= Date: Thu, 23 May 2019 18:08:47 +0000 Subject: [PATCH 13/28] Update .gitlab-ci.yml --- .gitlab-ci.yml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ed3355f..b20e35a 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -17,4 +17,9 @@ build: - find -maxdepth 1 -type d -not -name ".git" -not -name "out" -not -name "." | xargs -I '{}' sh -c 'cd {} && zip -r ../out/{} .' artifacts: paths: - - ./out \ No newline at end of file + - ./out + +deploy: + stage: deploy + script: + - ls \ No newline at end of file From 503e5819ed406d8ce9a932e235b3f50a7a2712b5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20L=C3=B8vbr=C3=B8tte=20Olsen?= Date: Thu, 23 May 2019 18:09:44 +0000 Subject: [PATCH 14/28] Update .gitlab-ci.yml --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b20e35a..6bca92c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -22,4 +22,4 @@ build: deploy: stage: deploy script: - - ls \ No newline at end of file + - ls out \ No newline at end of file From 11335d0955cd8e17d35e369ba326f72c84accb55 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20L=C3=B8vbr=C3=B8tte=20Olsen?= Date: Thu, 23 May 2019 18:10:27 +0000 Subject: [PATCH 15/28] Update .gitlab-ci.yml --- .gitlab-ci.yml | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 6bca92c..cc66bdf 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -4,15 +4,10 @@ # you can delete this line if you're not using Docker image: alpine:latest -before_script: - - apk add --no-cache zip - -after_script: - - ls - build: stage: build script: + - apk add --no-cache zip - mkdir out - find -maxdepth 1 -type d -not -name ".git" -not -name "out" -not -name "." | xargs -I '{}' sh -c 'cd {} && zip -r ../out/{} .' artifacts: From 774e8e968146a5d2ed07efe14e2687af0ddd0b80 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20L=C3=B8vbr=C3=B8tte=20Olsen?= Date: Thu, 23 May 2019 18:36:46 +0000 Subject: [PATCH 16/28] Update .gitlab-ci.yml --- .gitlab-ci.yml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index cc66bdf..a21c74c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -17,4 +17,10 @@ build: deploy: stage: deploy script: - - ls out \ No newline at end of file + - 'which ssh-agent || ( apt-get update -y && apt-get install openssh-client -y )' + - eval $(ssh-agent -s) + - echo "$SSH_PRIVATE_KEY" | tr -d '\r' | ssh-add - > /dev/null + - mkdir -p ~/.ssh + - chmod 700 ~/.ssh + + - ssh "$SERVER_HOST" ls \ No newline at end of file From 64e01c0827e4fc3db8c727fcc07aaf111c19c5da Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20L=C3=B8vbr=C3=B8tte=20Olsen?= Date: Thu, 23 May 2019 18:38:04 +0000 Subject: [PATCH 17/28] Update .gitlab-ci.yml --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a21c74c..25bdd1d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -17,7 +17,7 @@ build: deploy: stage: deploy script: - - 'which ssh-agent || ( apt-get update -y && apt-get install openssh-client -y )' + - 'which ssh-agent || ( apk add --no-cache zip openssh-client )' - eval $(ssh-agent -s) - echo "$SSH_PRIVATE_KEY" | tr -d '\r' | ssh-add - > /dev/null - mkdir -p ~/.ssh From 450552af1851a11c376a05eafb39334ed6c837d0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20L=C3=B8vbr=C3=B8tte=20Olsen?= Date: Thu, 23 May 2019 18:50:26 +0000 Subject: [PATCH 18/28] Update .gitlab-ci.yml --- .gitlab-ci.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 25bdd1d..46eb9ea 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -22,5 +22,7 @@ deploy: - echo "$SSH_PRIVATE_KEY" | tr -d '\r' | ssh-add - > /dev/null - mkdir -p ~/.ssh - chmod 700 ~/.ssh + - echo "$SSH_KNOWN_HOSTS" > ~/.ssh/known_hosts + - chmod 644 ~/.ssh/known_hosts - ssh "$SERVER_HOST" ls \ No newline at end of file From 4f08f8a340928bca0b3760b653728f29250af69c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20L=C3=B8vbr=C3=B8tte=20Olsen?= Date: Thu, 23 May 2019 18:53:53 +0000 Subject: [PATCH 19/28] Update .gitlab-ci.yml --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 46eb9ea..3a8e7c0 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -25,4 +25,4 @@ deploy: - echo "$SSH_KNOWN_HOSTS" > ~/.ssh/known_hosts - chmod 644 ~/.ssh/known_hosts - - ssh "$SERVER_HOST" ls \ No newline at end of file + - ssh "$SERVER_HOST" ls "$WPD_FOLDER" \ No newline at end of file From 5cfe1b23f127ab7ee500f197098be633c72c8e62 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20L=C3=B8vbr=C3=B8tte=20Olsen?= Date: Thu, 23 May 2019 19:03:09 +0000 Subject: [PATCH 20/28] Update .gitlab-ci.yml --- .gitlab-ci.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 3a8e7c0..6c435dc 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -17,7 +17,9 @@ build: deploy: stage: deploy script: - - 'which ssh-agent || ( apk add --no-cache zip openssh-client )' + - 'which ssh-agent || ( apk add --no-cache openssh-client )' + - apk add --no-cache rsync + - eval $(ssh-agent -s) - echo "$SSH_PRIVATE_KEY" | tr -d '\r' | ssh-add - > /dev/null - mkdir -p ~/.ssh @@ -25,4 +27,4 @@ deploy: - echo "$SSH_KNOWN_HOSTS" > ~/.ssh/known_hosts - chmod 644 ~/.ssh/known_hosts - - ssh "$SERVER_HOST" ls "$WPD_FOLDER" \ No newline at end of file + - rsync --dry-run -avz "$SERVER_HOST" out/ "$WPD_FOLDER" \ No newline at end of file From afb6705f5c3ddce56ccb881d820b4939ee27a3b2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20L=C3=B8vbr=C3=B8tte=20Olsen?= Date: Thu, 23 May 2019 19:05:33 +0000 Subject: [PATCH 21/28] Update .gitlab-ci.yml --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 6c435dc..f110c12 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -27,4 +27,4 @@ deploy: - echo "$SSH_KNOWN_HOSTS" > ~/.ssh/known_hosts - chmod 644 ~/.ssh/known_hosts - - rsync --dry-run -avz "$SERVER_HOST" out/ "$WPD_FOLDER" \ No newline at end of file + - rsync --dry-run -avz out/ "$SERVER_HOST":"$WPD_FOLDER" \ No newline at end of file From 34341404814764c98d5e4c3fe388776dfa30d5ba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20L=C3=B8vbr=C3=B8tte=20Olsen?= Date: Thu, 23 May 2019 19:06:57 +0000 Subject: [PATCH 22/28] Update .gitlab-ci.yml --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index f110c12..0ec1bcd 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -27,4 +27,4 @@ deploy: - echo "$SSH_KNOWN_HOSTS" > ~/.ssh/known_hosts - chmod 644 ~/.ssh/known_hosts - - rsync --dry-run -avz out/ "$SERVER_HOST":"$WPD_FOLDER" \ No newline at end of file + - rsync --dry-run -avz out/ "$SERVER_HOST":"$WPD_FOLDER" --delete \ No newline at end of file From 2dd48e0edb2787a426a9d2faa0af670482e11069 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20L=C3=B8vbr=C3=B8tte=20Olsen?= Date: Thu, 23 May 2019 19:09:04 +0000 Subject: [PATCH 23/28] Update .gitlab-ci.yml --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 0ec1bcd..5459829 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -27,4 +27,4 @@ deploy: - echo "$SSH_KNOWN_HOSTS" > ~/.ssh/known_hosts - chmod 644 ~/.ssh/known_hosts - - rsync --dry-run -avz out/ "$SERVER_HOST":"$WPD_FOLDER" --delete \ No newline at end of file + - rsync --dry-run -avz out/ "$SERVER_HOST":"$WPD_FOLDER" --delete --exclude bukkit \ No newline at end of file From d1a01745bf59d410442a643d18c8049ce230982b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20L=C3=B8vbr=C3=B8tte=20Olsen?= Date: Thu, 23 May 2019 19:11:27 +0000 Subject: [PATCH 24/28] Update .gitlab-ci.yml --- .gitlab-ci.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 5459829..a2337e6 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -27,4 +27,7 @@ deploy: - echo "$SSH_KNOWN_HOSTS" > ~/.ssh/known_hosts - chmod 644 ~/.ssh/known_hosts - - rsync --dry-run -avz out/ "$SERVER_HOST":"$WPD_FOLDER" --delete --exclude bukkit \ No newline at end of file + - rsync --dry-run -avz out/ "$SERVER_HOST":"$WPD_FOLDER" --delete --exclude bukkit + only: + - master + when: manual \ No newline at end of file From d8fe8c3ea78fcf28f8bd23ff678075af527322b1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20L=C3=B8vbr=C3=B8tte=20Olsen?= Date: Thu, 23 May 2019 19:29:22 +0000 Subject: [PATCH 25/28] Update .gitlab-ci.yml --- .gitlab-ci.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a2337e6..686d827 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -28,6 +28,9 @@ deploy: - chmod 644 ~/.ssh/known_hosts - rsync --dry-run -avz out/ "$SERVER_HOST":"$WPD_FOLDER" --delete --exclude bukkit + + - ssh "$SERVER_HOST" mcrcon -H localhost -p minecraft "say Reloading Resourcepacks" + - ssh "$SERVER_HOST" mcrcon -H localhost -p minecraft "minecraft:reload" only: - master when: manual \ No newline at end of file From 74ba37796a2ca60cfefc301934bbe69419435e9f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20L=C3=B8vbr=C3=B8tte=20Olsen?= Date: Thu, 23 May 2019 19:32:28 +0000 Subject: [PATCH 26/28] Update .gitlab-ci.yml --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 686d827..202ec9c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -29,7 +29,7 @@ deploy: - rsync --dry-run -avz out/ "$SERVER_HOST":"$WPD_FOLDER" --delete --exclude bukkit - - ssh "$SERVER_HOST" mcrcon -H localhost -p minecraft "say Reloading Resourcepacks" + - ssh "$SERVER_HOST" mcrcon -H localhost -p minecraft "minecraft:say Reloading Resourcepacks" - ssh "$SERVER_HOST" mcrcon -H localhost -p minecraft "minecraft:reload" only: - master From d5f4b56d2a56276dc858bee66b2ebfb8cae29d72 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20L=C3=B8vbr=C3=B8tte=20Olsen?= Date: Thu, 23 May 2019 19:36:04 +0000 Subject: [PATCH 27/28] Update .gitlab-ci.yml --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 202ec9c..0ddb024 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -29,7 +29,7 @@ deploy: - rsync --dry-run -avz out/ "$SERVER_HOST":"$WPD_FOLDER" --delete --exclude bukkit - - ssh "$SERVER_HOST" mcrcon -H localhost -p minecraft "minecraft:say Reloading Resourcepacks" + - ssh "$SERVER_HOST" mcrcon -H localhost -p minecraft "say hello to my little friend" - ssh "$SERVER_HOST" mcrcon -H localhost -p minecraft "minecraft:reload" only: - master From 82d704f331af2f85636a18b2957cc7aa0bceeba4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20L=C3=B8vbr=C3=B8tte=20Olsen?= Date: Thu, 23 May 2019 19:39:21 +0000 Subject: [PATCH 28/28] Update .gitlab-ci.yml --- .gitlab-ci.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 0ddb024..656a474 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -29,7 +29,6 @@ deploy: - rsync --dry-run -avz out/ "$SERVER_HOST":"$WPD_FOLDER" --delete --exclude bukkit - - ssh "$SERVER_HOST" mcrcon -H localhost -p minecraft "say hello to my little friend" - ssh "$SERVER_HOST" mcrcon -H localhost -p minecraft "minecraft:reload" only: - master