Skip to content

Commit

Permalink
20230602 1.46
Browse files Browse the repository at this point in the history
  • Loading branch information
mczph committed Jun 2, 2023
1 parent a7e32e7 commit f6a744b
Show file tree
Hide file tree
Showing 17 changed files with 53 additions and 73 deletions.
10 changes: 5 additions & 5 deletions config/MemoryTester/Crash.txt
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
InfoHeader=The game was forcibly crashed because of an insufficient memory allocation. />Font:Yu Gothic UI Light />FontType:normal />FontSize:30 />Color:0, 0, 0, 255
InfoHeader=The game was forcibly crashed because of an insufficient memory allocation. />Font:Yu Gothic UI Light />FontType:normal />FontSize:30 />Color:255, 255, 255, 255

InfoLine1=Your current memory allocation is [AllocatedMemory]MB. />Font:Yu Gothic UI Light />FontType:normal />FontSize:30 />Color:0, 0, 0, 255
InfoLine1=Your current memory allocation is [AllocatedMemory]MB. />Font:Yu Gothic UI Light />FontType:normal />FontSize:30 />Color:255, 255, 255, 255

InfoLine2=Please allocate [RecommendedMemory]MB before running. />Font:Yu Gothic UI Light />FontType:normal />FontSize:30 />Color:0, 0, 0, 255
InfoLine2=Please allocate [RecommendedMemory]MB before running. />Font:Yu Gothic UI Light />FontType:normal />FontSize:30 />Color:255, 255, 255, 255

InfoFooter=If you would like to play with a lower allocation, contact the pack maker to adjust the settings. />Font:Yu Gothic UI Light />FontType:normal />FontSize:30 />Color:0, 0, 0, 255
InfoFooter=If your total memory is low, you may not be able to launch the game. />Font:Yu Gothic UI Light />FontType:normal />FontSize:30 />Color:255, 255, 255, 255

RedirectLink=null

RedirectBgColor=255, 255, 255, 255

BackgroundImageDir=resources/backgroundImage.png
BackgroundImageDir=resources/background.png
2 changes: 1 addition & 1 deletion config/MemoryTester/General.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
MemoryTesterVersion=0.4.2

RecommendedMemoryAllocation=6000
RecommendedMemoryAllocation=6144

UseMenu=false

Expand Down
Binary file added config/MemoryTester/resources/background.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed config/MemoryTester/resources/backgroundImage.png
Binary file not shown.
44 changes: 0 additions & 44 deletions config/chesttransporter.cfg

This file was deleted.

2 changes: 1 addition & 1 deletion config/ftbquests/normal/chapters/aa0595b3/chapter.snbt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
title: "《将万物压缩获得宇宙的力量》目前重写中",
title: "《将万物压缩获得宇宙的力量》",
icon: "avaritia:resource 1 6",
description: [
"阶段八"
Expand Down
14 changes: 14 additions & 0 deletions config/ftbquests/normal/chapters/cd4fea27/e586cd12.snbt
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
{
x: 6.5d,
y: 4.0d,
dependencies: [
"6b7ba369"
],
tasks: [{
uid: "84cd63f4",
type: "item",
items: [{
item: "betterfurnacesreforged:extreme_furnace"
}]
}]
}
14 changes: 14 additions & 0 deletions config/ftbquests/normal/chapters/cd4fea27/f8a4a36b.snbt
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
{
x: 8.0d,
y: 4.0d,
dependencies: [
"e586cd12"
],
tasks: [{
uid: "c25a58ef",
type: "item",
items: [{
item: "betterfurnacesreforged:extreme_forge"
}]
}]
}
6 changes: 3 additions & 3 deletions config/mysticalagriculture.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -547,16 +547,16 @@ world {
I:prosperity_veinsize=6

# Maximum Y level Soulstone should spawn. [range: 1 ~ 127, default: 124]
I:soulstone_maxy=124
I:soulstone_maxy=64

# Minimum Y level Soulstone should spawn. [range: 1 ~ 127, default: 16]
I:soulstone_miny=16

# Amount of Soulstone veins to spawn. Higher = more. [range: 0 ~ 100, default: 8]
I:soulstone_veincount=8
I:soulstone_veincount=4

# Size of the Soulstone veins. [range: 0 ~ 40, default: 40]
I:soulstone_veinsize=40
I:soulstone_veinsize=24
}


4 changes: 2 additions & 2 deletions config/thaumcraft_misc.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@

general {
# Enables a version of the Thauminomicon in creative mode that grants you all the research when you first use it.
B:allowCheatSheet=false
B:allowCheatSheet=true

# Setting this to true will make you get the recipe book for salis mundus without having to sleep first.
B:noSleep=false
B:noSleep=true

# How much vis it costs to reacharge a single unit of shielding. Minimum of 0.
# Min: 0
Expand Down
7 changes: 0 additions & 7 deletions config/time.history

This file was deleted.

1 change: 1 addition & 0 deletions config/tips.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ general {
custom.ia.tips.18
custom.ia.tips.19
custom.ia.tips.20
custom.ia.tips.21
>

# The color of the actual tip text. [default: FFFFFF]
Expand Down
7 changes: 4 additions & 3 deletions config/txloader/load/tips/lang/en_us.lang
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ custom.ia.tips.4=Shift+Z to display a larger image of the item (by Item Zoom mod
custom.ia.tips.5=Ctrl+Q to throw a group of items
custom.ia.tips.6=You can automate Arcane Worktable
custom.ia.tips.7=You can tell me directly if there is no internationalization in Modpack
custom.ia.tips.8=Don't rush, why do we say "don't rush"? Don't be hasty is an attitude, a kind of relaxation, a kind of non-hurried, a kind of calm and comfortable. Don't be hasty" teaches us to be humble and convince others with reason; when we encounter frustration and indignation, we are fools, "don't be hasty" teaches us to find another way and win with wisdom. "Don't be in a hurry" reflects the middle way of Chinese Confucianism, and reflects the philosophy of life of being humble, humble and peaceful.
custom.ia.tips.8=Try to see this tip in Chinese?
custom.ia.tips.9=Excellent Curseforge players are not playing survival [doge]
custom.ia.tips.10=This kind of crap, I do not know what to say, the premise of this situation will be because of the phantom body radiation in the law / Weck inward space, the formation of wave state neutron centripetal force field with η / Ð macro particle rays as the field energy, however, the current spacetime of the basic entity constants and the terranuclear mass energy fixed, in its absorption process in the terranuclear, will be similar to the current background space between the formation of a central radial ring space, which leads to the gravitational dynamic field energy transient value recoil effect of all the matrix entities directly in the υ terranuclear nucleus.
custom.ia.tips.11=Do not do Modpack, it will become unfortunate
custom.ia.tips.10=How many times have you seen this tip?
custom.ia.tips.11=Do not make Modpack, it will become unfortunate
custom.ia.tips.12=Press keypad 1 or 2 against a square in the world to see its synthesis recipe (provided by Recipe Search Buttons mod)
custom.ia.tips.13=Press K to configure inventory organization
custom.ia.tips.14=Your hands are for your whole life, not just the Modpack
Expand All @@ -18,3 +18,4 @@ custom.ia.tips.17=Tinkers' Astral and Endspeed traits have been disabled
custom.ia.tips.18=The display of TOP has been modified so that if the tool type is shown in green, it is currently available for digging, and in yellow, it is not
custom.ia.tips.19=You can press F3+R to reload the audio driver / sound library (by Reload Audio Driver mod)
custom.ia.tips.20=Remember to /rescan after you reconnect your mouse
custom.ia.tips.21=Chests can be placed side by side like higher versions
1 change: 1 addition & 0 deletions config/txloader/load/tips/lang/zh_cn.lang
Original file line number Diff line number Diff line change
Expand Up @@ -18,3 +18,4 @@ custom.ia.tips.17=匠魂的星辰特性和折跃已被禁用
custom.ia.tips.18=TOP的显示经过修改,如工具类型显示为绿色则当前可以挖掘,为黄色则为不可挖掘
custom.ia.tips.19=你可以按下F3+R以重载音频驱动(由音频驱动重载模组提供)
custom.ia.tips.20=记得在重新连接鼠标后输入/rescan指令
custom.ia.tips.21=箱子可以像高版本那样并排放置
4 changes: 2 additions & 2 deletions config/versioner.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -58,13 +58,13 @@ general {
>

# Version code of the current version, must not be negative.
I:versionCode=45
I:versionCode=46

# How to output formatted version name. Only used for displaying current version.
S:versionFormat=%currentVersionName%

# Version name of the current version
S:versionName=1.45
S:versionName=1.46
}

##########################################################################################################
Expand Down
2 changes: 1 addition & 1 deletion groovy/runConfig.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"packName": "Interactions",
"version": "1.45",
"version": "1.46",
"debug": false,
"loaders": {
"preInit": [
Expand Down
8 changes: 4 additions & 4 deletions options.txt
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@ anaglyph3d:false
maxFps:260
fboEnable:true
difficulty:2
fancyGraphics:false
ao:0
renderClouds:fast
fancyGraphics:true
ao:2
renderClouds:true
resourcePacks:["Minecraft-Mod-Language-Modpack.zip"]
incompatibleResourcePacks:[]
lastServer:
Expand All @@ -26,7 +26,7 @@ chatLinksPrompt:true
chatOpacity:1.0
snooperEnabled:false
fullscreen:false
enableVsync:true
enableVsync:false
useVbo:true
hideServerAddress:false
advancedItemTooltips:false
Expand Down

0 comments on commit f6a744b

Please sign in to comment.