Merge branch 'master' into abp-formatting-fixes

This commit is contained in:
Marcx authored and GitHub committed 2022-01-16 10:42:56 +01:00
commit 9df1a37c05
36 files changed
+4149 -1909

No files matched your search

+10 -1
View File
@@ -16,7 +16,7 @@ EID.descriptions[languageCode].custom = {} -- table for custom entity descriptio
EID.descriptions[languageCode].languageName = "English"
-- Fonts to be used with this language pack
EID.descriptions[languageCode].fonts={"default", "inverted", "borderless"}
EID.descriptions[languageCode].fonts = {{name="default", lineHeight=11}, {name="inverted", lineHeight=11}, {name="borderless", lineHeight=11}}
---------- Collectibles ----------
EID.descriptions[languageCode].collectibles={
@@ -866,3 +866,12 @@ EID.descriptions[languageCode].transformations={
"Adult", -- 14
"Stompy" -- 15
}
---------- MISC ----------
EID.descriptions[languageCode].MCM = {
DemoObjectName = "Demo Object Name",
DemoObjectTransformation = "Demo Transformation",
DemoObjectText = "This text is in english#A very cool and long description to simulate linebreaks caused by EID textbox width!#\1 This is also a cool line#This line loves you {{Heart}}",
}