Merge remote-tracking branch 'origin/master'

LordRalex · LordRalex · commit 5b0a56da9a67 · 2023-02-19T15:38:47.000-06:00
# Conflicts:
#	go.mod
#	go.sum
#	package-lock.json
diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-# cp.ae97.net
+# cp.minecrafthopper.net
 
 ## Project setup
 ```
diff --git a/env/env.go b/env/env.go
@@ -8,7 +8,7 @@ import (
 	"strings"
 )
 
-var cache map[string]string
+var cache = make(map[string]string)
 
 func init() {
 	viper.AutomaticEnv()

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ import (`
`8`	`8`	`"strings"`
`9`	`9`	`)`
`10`	`10`
`11`		`-var cache map[string]string`
	`11`	`+var cache = make(map[string]string)`
`12`	`12`
`13`	`13`	`func init() {`
`14`	`14`	`viper.AutomaticEnv()`