godot/mc-perfect
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: godot:73d49d00c872576d836b31706a46902dc476bcf8
Branches Tags
godot:life2
...
compare: godot:6d9b10886a7362a30919c02e5f5132d13340a09a
Branches Tags
godot:life2

2 Commits
73d49d00c8 ... 6d9b10886a

Author SHA1 Message Date
ggodot
6d9b10886a merging and simplifying 2026-01-28 10:52:04 +01:00
ggodot
95a21c19bb simplifying to bugfix 2026-01-28 10:47:06 +01:00
1 changed files with 12 additions and 4 deletions
Show Stats Expand all files Collapse all files

16
mc-install.sh
View File

@ -94,9 +94,13 @@ elif [[ "$maxRam" =~ ("G"|"M") ]]; then
printf "\n+ Allocating $maxRam as RAM maximum." printf "\n+ Allocating $maxRam as RAM maximum."
echo "-Xmx$maxRam" >> /opt/minecraft/user_jvm_args.txt echo "-Xmx$maxRam" >> /opt/minecraft/user_jvm_args.txt
elif [[ -z $maxRam ]]; then elif [[ -z $maxRam ]]; then
$maxRam="4G" <<<<<<< HEAD
printf "\n+ Allocating $MaxRam as RAM maximum" printf "\n+ Allocating $MaxRam as RAM maximum"
echo "-Xmx$maxRam" >> /opt/minecraft/user_jvm_args.txt echo "-Xmx4G" >> user_jvm_args.txt
=======
printf "\n+ Allocating $MaxRam as RAM maximum"
echo "-Xmx4G" >> /opt/minecraft/user_jvm_args.txt
>>>>>>> refs/remotes/origin/life2
elif [[ ! "$maxRam" =~ ("G"|"MB") ]]; then elif [[ ! "$maxRam" =~ ("G"|"MB") ]]; then
printf "\n+ Allocating ${maxRam}G as RAM maximum" printf "\n+ Allocating ${maxRam}G as RAM maximum"
echo "-Xmx${maxRam}G" >> /opt/minecraft/user_jvm_args.txt echo "-Xmx${maxRam}G" >> /opt/minecraft/user_jvm_args.txt
@ -113,9 +117,13 @@ elif [[ "$minRam" =~ ("G"|"M") ]]; then
printf "\n+ Allocating $minRam as RAM minimum." printf "\n+ Allocating $minRam as RAM minimum."
echo "-Xms$minRam" >> /opt/minecraft/user_jvm_args.txt echo "-Xms$minRam" >> /opt/minecraft/user_jvm_args.txt
elif [[ -z $minRam ]]; then elif [[ -z $minRam ]]; then
$minRam="1G" <<<<<<< HEAD
printf "\n+ Allocating $minRam as RAM minimum" printf "\n+ Allocating $minRam as RAM minimum"
echo "-Xms$minRam" >> /opt/minecraft/user_jvm_args.txt echo "-Xms1G" >> user_jvm_args.txt
=======
printf "\n+ Allocating $minRam as RAM minimum"
echo "-Xms1G" >> /opt/minecraft/user_jvm_args.txt
>>>>>>> refs/remotes/origin/life2
elif [[ ! "$minRam" =~ ("G"|"MB") ]]; then elif [[ ! "$minRam" =~ ("G"|"MB") ]]; then
printf "Allocating ${minRam}G as RAM maximum" printf "Allocating ${minRam}G as RAM maximum"
echo "-Xms${minRam}G" >> /opt/minecraft/user_jvm_args.txt echo "-Xms${minRam}G" >> /opt/minecraft/user_jvm_args.txt