diff --git a/config/oculus.properties b/config/oculus.properties index eec2ce20a..ca4030e03 100644 --- a/config/oculus.properties +++ b/config/oculus.properties @@ -1,8 +1,8 @@ #This file stores configuration options for Iris, such as the currently active shaderpack -#Mon Nov 06 10:07:44 NOVT 2023 +#Mon Nov 06 17:25:23 NOVT 2023 colorSpace=SRGB disableUpdateMessage=false enableDebugOptions=false -enableShaders=true +enableShaders=false maxShadowRenderDistance=32 -shaderPack= +shaderPack=ComplementaryReimagined_r5.0.1.zip diff --git a/config/roughlyenoughitems/pinyin.properties b/config/roughlyenoughitems/pinyin.properties index 87765b87f..6171ed5da 100644 --- a/config/roughlyenoughitems/pinyin.properties +++ b/config/roughlyenoughitems/pinyin.properties @@ -1,2 +1,2 @@ #Pinyin Options -#Mon Nov 06 10:08:49 NOVT 2023 +#Mon Nov 06 17:26:02 NOVT 2023 diff --git a/config/roughlyenoughitems/pinyin_double.properties b/config/roughlyenoughitems/pinyin_double.properties index fc1838a14..5bda32de5 100644 --- a/config/roughlyenoughitems/pinyin_double.properties +++ b/config/roughlyenoughitems/pinyin_double.properties @@ -1,3 +1,3 @@ #Double Pinyin Options -#Mon Nov 06 10:08:49 NOVT 2023 +#Mon Nov 06 17:26:02 NOVT 2023 Converter=sougou diff --git a/config/xaerominimap_entities.json b/config/xaerominimap_entities.json index 46474f8c6..c2360d359 100644 --- a/config/xaerominimap_entities.json +++ b/config/xaerominimap_entities.json @@ -22,8 +22,8 @@ "startFadingAt": 0.0, "renderOverMinimapFrame": 1.0, "icons": 1.0, - "heightLimit": 20.0, "names": 0.0, + "heightLimit": 20.0, "iconScale": 1.0 }, "subCategories": [ diff --git a/fancymenu_data/last_world.fmdata b/fancymenu_data/last_world.fmdata index 6aa992663..71f3d0169 100644 --- a/fancymenu_data/last_world.fmdata +++ b/fancymenu_data/last_world.fmdata @@ -2,6 +2,6 @@ type = last_world last_world { is_server = false - world = C:/Users/Dmitry/AppData/Roaming/com.modrinth.theseus/profiles/TFG 1.20.1/saves/New World (7) + world = C:/Users/Dmitry/AppData/Roaming/com.modrinth.theseus/profiles/TFG 1.20.1/saves/New World (13) } diff --git a/kubejs/assets/kubejs/lang/en_us.json b/kubejs/assets/kubejs/lang/en_us.json index cbfb319ba..7a73a41bf 100644 --- a/kubejs/assets/kubejs/lang/en_us.json +++ b/kubejs/assets/kubejs/lang/en_us.json @@ -1,25 +1,2 @@ { - "tagprefix.poor_raw": "Poor %s Ore", - "tagprefix.rich_raw": "Rich %s Ore", - - "tagprefix.tfc_gabbro": "TFC Gabbro %s Ore", - "tagprefix.tfc_shale": "TFC Shale %s Ore", - "tagprefix.tfc_claystone": "TFC Claystone %s Ore", - "tagprefix.tfc_limestone": "TFC Limestone %s Ore", - "tagprefix.tfc_conglomerate": "TFC Conglomerate %s Ore", - "tagprefix.tfc_dolomite": "TFC Dolomite %s Ore", - "tagprefix.tfc_chert": "TFC Chert %s Ore", - "tagprefix.tfc_chalk": "TFC Chalk %s Ore", - "tagprefix.tfc_rhyolite": "TFC Rhyolite %s Ore", - "tagprefix.tfc_dacite": "TFC Dacite %s Ore", - "tagprefix.tfc_quartzite": "TFC Quartzite %s Ore", - "tagprefix.tfc_slate": "TFC Slate %s Ore", - "tagprefix.tfc_phyllite": "TFC Phyllite %s Ore", - "tagprefix.tfc_schist": "TFC Schist %s Ore", - "tagprefix.tfc_gneiss": "TFC Gneiss %s Ore", - "tagprefix.tfc_marble": "TFC Marble %s Ore", - "tagprefix.tfc_basalt": "TFC Basalt %s Ore", - "tagprefix.tfc_diorite": "TFC Diorite %s Ore", - "tagprefix.tfc_andesite": "TFC Andesite %s Ore", - "tagprefix.tfc_granite": "TFC Granite %s Ore" } \ No newline at end of file diff --git a/kubejs/data/tfc/recipes/casting/test.json b/kubejs/data/tfc/recipes/casting/test.json deleted file mode 100644 index 7fef7c921..000000000 --- a/kubejs/data/tfc/recipes/casting/test.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "__comment__": "This file was automatically created by mcresources", - "type": "tfc:casting", - "mold": { - "item": "tfc:ceramic/axe_head_mold" - }, - "fluid": { - "ingredient": "tfc:metal/bismuth_bronze", - "amount": 144 - }, - "result": { - "item": "tfc:metal/axe_head/bismuth_bronze" - }, - "break_chance": 1 - } \ No newline at end of file diff --git a/kubejs/data/tfc/recipes/heating/test.json b/kubejs/data/tfc/recipes/heating/test.json deleted file mode 100644 index 7537e7f8b..000000000 --- a/kubejs/data/tfc/recipes/heating/test.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "__comment__": "This file was automatically created by mcresources", - "type": "tfc:heating", - "ingredient": { - "item": "gtceu:copper_poor_raw" - }, - "result_fluid": { - "fluid": "tfc:metal/copper", - "amount": 16 - }, - "temperature": 270 -} \ No newline at end of file diff --git a/mods/terrafirmagreg-0.0.1.jar b/mods/terrafirmagreg-0.0.1.jar index b9dd7678e..9f0ae417b 100644 Binary files a/mods/terrafirmagreg-0.0.1.jar and b/mods/terrafirmagreg-0.0.1.jar differ