Skip to content

Commit

Permalink
Merge branch 'working'
Browse files Browse the repository at this point in the history
  • Loading branch information
@LofiMonk
LofiMonk committed Feb 26, 2021
2 parents e1b6e25 + b5a568d commit 06872a4
Show file tree
Hide file tree
Showing 6 changed files with 47 additions and 47 deletions.
42 changes: 21 additions & 21 deletions BP Bot-Topia/bridge/cache/BP/manifest.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"file_type": "manifest_bp",
"format_version": 1,
"file_uuid": "c0326798_cc0e_435b_b79b_d0e181c111cc",
"file_version": 1,
"file_version": 2,
"cache_content": {
"children": [
{
Expand All @@ -20,7 +20,7 @@
"version": [
1,
0,
10
11
],
"min_engine_version": [
1,
Expand All @@ -35,7 +35,7 @@
"version": [
1,
0,
10
11
]
}
],
Expand All @@ -44,7 +44,7 @@
"version": [
1,
0,
10
11
],
"uuid": "61ee56da-98dc-497f-a32a-996045841bd9"
}
Expand All @@ -68,7 +68,7 @@
"version": [
1,
0,
10
11
],
"min_engine_version": [
1,
Expand All @@ -87,7 +87,7 @@
"version": [
1,
0,
10
11
],
"min_engine_version": [
1,
Expand All @@ -100,7 +100,7 @@
"children": [
1,
0,
10
11
]
},
{
Expand All @@ -124,7 +124,7 @@
"version": [
1,
0,
10
11
],
"min_engine_version": [
1,
Expand All @@ -139,7 +139,7 @@
"version": [
1,
0,
10
11
]
}
],
Expand All @@ -148,7 +148,7 @@
"version": [
1,
0,
10
11
],
"uuid": "61ee56da-98dc-497f-a32a-996045841bd9"
}
Expand All @@ -164,7 +164,7 @@
"version": [
1,
0,
10
11
]
}
],
Expand All @@ -180,7 +180,7 @@
"version": [
1,
0,
10
11
]
},
"data": "e451a114-9621-42a9-b52f-e9bf54449d90",
Expand All @@ -193,15 +193,15 @@
"version": [
1,
0,
10
11
]
},
"key": "version",
"is_minified": true,
"children": [
1,
0,
10
11
]
}
]
Expand All @@ -218,7 +218,7 @@
"version": [
1,
0,
10
11
],
"min_engine_version": [
1,
Expand All @@ -233,7 +233,7 @@
"version": [
1,
0,
10
11
]
}
],
Expand All @@ -242,7 +242,7 @@
"version": [
1,
0,
10
11
],
"uuid": "61ee56da-98dc-497f-a32a-996045841bd9"
}
Expand All @@ -256,7 +256,7 @@
"version": [
1,
0,
10
11
],
"uuid": "61ee56da-98dc-497f-a32a-996045841bd9"
}
Expand All @@ -267,7 +267,7 @@
"version": [
1,
0,
10
11
],
"uuid": "61ee56da-98dc-497f-a32a-996045841bd9"
},
Expand All @@ -276,15 +276,15 @@
"children": [
1,
0,
10
11
]
},
{
"open": {
"version": [
1,
0,
10
11
],
"uuid": "61ee56da-98dc-497f-a32a-996045841bd9"
},
Expand Down
24 changes: 12 additions & 12 deletions BP Bot-Topia/bridge/cache/RP/manifest.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"file_type": "manifest_rp",
"format_version": 1,
"file_uuid": "45056ba7_b38e_48c1_9216_bef50fba5b4e",
"file_version": 1,
"file_version": 2,
"cache_content": {
"children": [
{
Expand All @@ -20,7 +20,7 @@
"version": [
1,
0,
10
11
],
"min_engine_version": [
1,
Expand All @@ -35,7 +35,7 @@
"version": [
1,
0,
10
11
]
}
]
Expand All @@ -58,7 +58,7 @@
"version": [
1,
0,
10
11
],
"min_engine_version": [
1,
Expand All @@ -77,7 +77,7 @@
"version": [
1,
0,
10
11
],
"min_engine_version": [
1,
Expand All @@ -90,7 +90,7 @@
"children": [
1,
0,
10
11
]
},
{
Expand All @@ -114,7 +114,7 @@
"version": [
1,
0,
10
11
],
"min_engine_version": [
1,
Expand All @@ -129,7 +129,7 @@
"version": [
1,
0,
10
11
]
}
]
Expand All @@ -144,7 +144,7 @@
"version": [
1,
0,
10
11
]
}
],
Expand All @@ -160,7 +160,7 @@
"version": [
1,
0,
10
11
]
},
"data": "b92632db-9ee2-4a67-8831-bc584a5d2882",
Expand All @@ -173,15 +173,15 @@
"version": [
1,
0,
10
11
]
},
"key": "version",
"is_minified": true,
"children": [
1,
0,
10
11
]
}
]
Expand Down
4 changes: 2 additions & 2 deletions BP Bot-Topia/bridge/cache/RP/texts/en_US.lang
View file

Large diffs are not rendered by default.

8 changes: 4 additions & 4 deletions BP Bot-Topia/manifest.json
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
//bridge-file-version: #1
//bridge-file-version: #2
{
"format_version": 2,
"header": {
Expand All @@ -8,7 +8,7 @@
"version": [
1,
0,
10
11
],
"min_engine_version": [
1,
Expand All @@ -23,7 +23,7 @@
"version": [
1,
0,
10
11
]
}
],
Expand All @@ -32,7 +32,7 @@
"version": [
1,
0,
10
11
],
"uuid": "61ee56da-98dc-497f-a32a-996045841bd9"
}
Expand Down
6 changes: 3 additions & 3 deletions RP Bot-Topia/manifest.json
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
//bridge-file-version: #1
//bridge-file-version: #2
{
"format_version": 2,
"header": {
Expand All @@ -8,7 +8,7 @@
"version": [
1,
0,
10
11
],
"min_engine_version": [
1,
Expand All @@ -23,7 +23,7 @@
"version": [
1,
0,
10
11
]
}
]
Expand Down
10 changes: 5 additions & 5 deletions RP Bot-Topia/texts/en_US.lang
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
##bridge-file-version: #54
##bridge-file-version: #55
pack.name=RP Bot-Topia
pack.description=v1.0.10 Bot-Topia resource pack §e*Mob Greifing must be turned §lON§r§e for this addon to work.
pack.description=v1.0.11 Bot-Topia resource pack §e*Mob Greifing must be turned §lON§r§e for this addon to work.

## items
item.lfm:basic_chip.name=Basic Chip
Expand Down Expand Up @@ -35,9 +35,9 @@ howtoplay.category.whatsNew=§aWhats New
##version update info
howtoplay.whatsNew.title=Bot-Topia: What's New
howtoplay.whatsnew= New
whatsNew.header.title00=§bWhat's New V1.0.10
bot_topia.whatsNew.text00=-had to revert back to old miner bot code. sorry guys.
bot_topia.whatsNew.text01=-all code has been refactored from the ground up.
whatsNew.header.title00=§bWhat's New V1.0.11
bot_topia.whatsNew.text00=-Bot Crafter recipe is fixed
bot_topia.whatsNew.text01=-
bot_topia.whatsNew.text02=§bNEW!§r Lumber Jack Bot!!
bot_topia.whatsNew.text03=§bNEW!§r Waterproof Module!!
whatsNew.header.title01=To Stay up to date with Bot-Topia check out the official release pages.
Expand Down

0 comments on commit 06872a4

Please sign in to comment.