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

Compare commits

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

No commits in common. "6d9b10886a7362a30919c02e5f5132d13340a09a" and "73d49d00c872576d836b31706a46902dc476bcf8" have entirely different histories.
6d9b10886a ... 73d49d00c8

1 changed files with 4 additions and 12 deletions
Show Stats Expand all files Collapse all files

16
mc-install.sh
View File

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