Skip to content

Commit 8119f59

Browse files
LTHCTheMasterLTHCTheMaster
authored
Merge pull request #11 from LTHCTheMaster/Dev
Dev
2 parents 4bb4620 + ad65c98 commit 8119f59

File tree

12 files changed

+36
-12
lines changed

12 files changed

+36
-12
lines changed

‎Datapack/data/lthc.mage/functions/mental_state/mental_reader/bad.mcfunction

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ scoreboard players set #200 lthc.mage.data 200
33
scoreboard players operation #temp lthc.mage.data = @s lthc.mage.mental_state_2
44
scoreboard players operation #temp lthc.mage.data *= #100 lthc.mage.data
55
scoreboard players operation #temp lthc.mage.data /= #200 lthc.mage.data
6-
title @s actionbar [{"text": "Hell - ", "italic": false, "color": "#FFFFFF","bold": true},{"score":{"name":"#temp","objective":"lthc.mage.data"}},{"text":"%"}]
6+
title @s actionbar [{"translate": "Bad - ", "italic": false, "color": "#FFFFFF","bold": true},{"score":{"name":"#temp","objective":"lthc.mage.data"}},{"text":"%"}]

‎Datapack/data/lthc.mage/functions/mental_state/mental_reader/good.mcfunction

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ scoreboard players set #1111 lthc.mage.data 1111
33
scoreboard players operation #temp lthc.mage.data = @s lthc.mage.mental_state_2
44
scoreboard players operation #temp lthc.mage.data *= #100 lthc.mage.data
55
scoreboard players operation #temp lthc.mage.data /= #1111 lthc.mage.data
6-
title @s actionbar [{"text": "Good - ", "italic": false, "color": "#FFFFFF","bold": true},{"score":{"name":"#temp","objective":"lthc.mage.data"}},{"text":"%"}]
6+
title @s actionbar [{"translate": "Good - ", "italic": false, "color": "#FFFFFF","bold": true},{"score":{"name":"#temp","objective":"lthc.mage.data"}},{"text":"%"}]

‎Datapack/data/lthc.mage/functions/mental_state/mental_reader/hell.mcfunction

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ scoreboard players set #20 lthc.mage.data 20
33
scoreboard players operation #temp lthc.mage.data = @s lthc.mage.mental_state_2
44
scoreboard players operation #temp lthc.mage.data *= #100 lthc.mage.data
55
scoreboard players operation #temp lthc.mage.data /= #20 lthc.mage.data
6-
title @s actionbar [{"text": "Hell - ", "italic": false, "color": "#FFFFFF","bold": true},{"score":{"name":"#temp","objective":"lthc.mage.data"}},{"text":"%"}]
6+
title @s actionbar [{"translate": "Hell - ", "italic": false, "color": "#FFFFFF","bold": true},{"score":{"name":"#temp","objective":"lthc.mage.data"}},{"text":"%"}]

‎Datapack/data/lthc.mage/functions/mental_state/mental_reader/neutral.mcfunction

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ scoreboard players set #500 lthc.mage.data 500
33
scoreboard players operation #temp lthc.mage.data = @s lthc.mage.mental_state_2
44
scoreboard players operation #temp lthc.mage.data *= #100 lthc.mage.data
55
scoreboard players operation #temp lthc.mage.data /= #500 lthc.mage.data
6-
title @s actionbar [{"text": "Neutral - ", "italic": false, "color": "#FFFFFF","bold": true},{"score":{"name":"#temp","objective":"lthc.mage.data"}},{"text":"%"}]
6+
title @s actionbar [{"translate": "Neutral - ", "italic": false, "color": "#FFFFFF","bold": true},{"score":{"name":"#temp","objective":"lthc.mage.data"}},{"text":"%"}]

‎Datapack/data/lthc.mage/functions/mental_state/mental_reader/really_bad.mcfunction

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ scoreboard players set #90 lthc.mage.data 90
33
scoreboard players operation #temp lthc.mage.data = @s lthc.mage.mental_state_2
44
scoreboard players operation #temp lthc.mage.data *= #100 lthc.mage.data
55
scoreboard players operation #temp lthc.mage.data /= #90 lthc.mage.data
6-
title @s actionbar [{"text": "Really Bad - ", "italic": false, "color": "#FFFFFF","bold": true},{"score":{"name":"#temp","objective":"lthc.mage.data"}},{"text":"%"}]
6+
title @s actionbar [{"translate": "Really Bad - ", "italic": false, "color": "#FFFFFF","bold": true},{"score":{"name":"#temp","objective":"lthc.mage.data"}},{"text":"%"}]

‎Datapack/data/lthc.mage/functions/mental_state/mental_reader/really_bad_p.mcfunction

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ scoreboard players set #55 lthc.mage.data 55
33
scoreboard players operation #temp lthc.mage.data = @s lthc.mage.mental_state_2
44
scoreboard players operation #temp lthc.mage.data *= #100 lthc.mage.data
55
scoreboard players operation #temp lthc.mage.data /= #55 lthc.mage.data
6-
title @s actionbar [{"text": "Really Bad + - ", "italic": false, "color": "#FFFFFF","bold": true},{"score":{"name":"#temp","objective":"lthc.mage.data"}},{"text":"%"}]
6+
title @s actionbar [{"translate": "Really Bad + - ", "italic": false, "color": "#FFFFFF","bold": true},{"score":{"name":"#temp","objective":"lthc.mage.data"}},{"text":"%"}]

‎Datapack/data/lthc.mage/functions/mental_state/mental_reader/really_bad_pp.mcfunction

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ scoreboard players set #35 lthc.mage.data 35
33
scoreboard players operation #temp lthc.mage.data = @s lthc.mage.mental_state_2
44
scoreboard players operation #temp lthc.mage.data *= #100 lthc.mage.data
55
scoreboard players operation #temp lthc.mage.data /= #35 lthc.mage.data
6-
title @s actionbar [{"text": "Really Bad ++ - ", "italic": false, "color": "#FFFFFF","bold": true},{"score":{"name":"#temp","objective":"lthc.mage.data"}},{"text":"%"}]
6+
title @s actionbar [{"translate": "Really Bad ++ - ", "italic": false, "color": "#FFFFFF","bold": true},{"score":{"name":"#temp","objective":"lthc.mage.data"}},{"text":"%"}]

‎Datapack/data/lthc.mage/functions/mental_state/mental_reader/really_good.mcfunction

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ scoreboard players set #2300 lthc.mage.data 2300
33
scoreboard players operation #temp lthc.mage.data = @s lthc.mage.mental_state_2
44
scoreboard players operation #temp lthc.mage.data *= #100 lthc.mage.data
55
scoreboard players operation #temp lthc.mage.data /= #2300 lthc.mage.data
6-
title @s actionbar [{"text": "Really Good - ", "italic": false, "color": "#FFFFFF","bold": true},{"score":{"name":"#temp","objective":"lthc.mage.data"}},{"text":"%"}]
6+
title @s actionbar [{"translate": "Really Good - ", "italic": false, "color": "#FFFFFF","bold": true},{"score":{"name":"#temp","objective":"lthc.mage.data"}},{"text":"%"}]

‎Datapack/data/lthc.mage/functions/mental_state/mental_reader/really_good_p.mcfunction

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ scoreboard players set #4750 lthc.mage.data 4750
33
scoreboard players operation #temp lthc.mage.data = @s lthc.mage.mental_state_2
44
scoreboard players operation #temp lthc.mage.data *= #100 lthc.mage.data
55
scoreboard players operation #temp lthc.mage.data /= #4750 lthc.mage.data
6-
title @s actionbar [{"text": "Really Good + - ", "italic": false, "color": "#FFFFFF","bold": true},{"score":{"name":"#temp","objective":"lthc.mage.data"}},{"text":"%"}]
6+
title @s actionbar [{"translate": "Really Good + - ", "italic": false, "color": "#FFFFFF","bold": true},{"score":{"name":"#temp","objective":"lthc.mage.data"}},{"text":"%"}]

‎Datapack/data/lthc.mage/functions/mental_state/mental_reader/really_good_pp.mcfunction

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ scoreboard players set #10235 lthc.mage.data 10235
33
scoreboard players operation #temp lthc.mage.data = @s lthc.mage.mental_state_2
44
scoreboard players operation #temp lthc.mage.data *= #100 lthc.mage.data
55
scoreboard players operation #temp lthc.mage.data /= #10235 lthc.mage.data
6-
title @s actionbar [{"text": "Really Good ++ - ", "italic": false, "color": "#FFFFFF","bold": true},{"score":{"name":"#temp","objective":"lthc.mage.data"}},{"text":"%"}]
6+
title @s actionbar [{"translate": "Really Good ++ - ", "italic": false, "color": "#FFFFFF","bold": true},{"score":{"name":"#temp","objective":"lthc.mage.data"}},{"text":"%"}]

‎Resourcespack/assets/minecraft/lang/fr_ca.json

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,5 +120,17 @@
120120
"\nWork with any essences": "\nFonctionne avec toutes les essences.",
121121
"Compact Essences": "Essences Compactes",
122122
"\nsame for each essences": "\nla même pour chaque essence.",
123-
"\nWork with any pylons": "\nFonctionne avec tous les pylônes."
123+
"\nWork with any pylons": "\nFonctionne avec tous les pylônes.",
124+
125+
"__comments": "mental state",
126+
"Bad - ":"Mauvais - ",
127+
"Good - ":"Bon - ",
128+
"Hell - ":"Enfer - ",
129+
"Neutral - ":"Neutre - ",
130+
"Really Bad + - ":"Très mauvais + - ",
131+
"Really Bad ++ - ":"Très mauvais ++ - ",
132+
"Really Good + - ":"Très bon + - ",
133+
"Really Good ++ - ":"Très bon ++ - ",
134+
"Really Good":"Très bon"
135+
124136
}

‎Resourcespack/assets/minecraft/lang/fr_fr.json

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,5 +121,17 @@
121121
"\nWork with any essences": "\nFonctionne avec toutes les essences.",
122122
"Compact Essences": "Essences Compactes",
123123
"\nsame for each essences": "\nla même pour chaque essence.",
124-
"\nWork with any pylons": "\nFonctionne avec tous les pylônes."
124+
"\nWork with any pylons": "\nFonctionne avec tous les pylônes.",
125+
126+
"__comments": "mental state",
127+
"Bad - ":"Mauvais - ",
128+
"Good - ":"Bon - ",
129+
"Hell - ":"Enfer - ",
130+
"Neutral - ":"Neutre - ",
131+
"Really Bad + - ":"Très mauvais + - ",
132+
"Really Bad ++ - ":"Très mauvais ++ - ",
133+
"Really Good + - ":"Très bon + - ",
134+
"Really Good ++ - ":"Très bon ++ - ",
135+
"Really Good":"Très bon"
136+
125137
}

0 commit comments

Comments
 (0)