Merge branch 'main' of https://github.com/TerraFirmaGreg-Team/TFG-Modpack-1.20.x

Xikaro · Xikaro · commit 146160463f6a · 2023-11-16T19:03:07.000+05:00
diff --git a/config/tfc-common.toml b/config/tfc-common.toml
@@ -15,7 +15,7 @@
 	# This represents a number of days offset from January 1, 1000
 	# The default is (5 * daysInMonth) = 40, which starts at June 1, 1000 (with the default daysInMonth = 8)
 	#Range: > -1
-	defaultCalendarStartDay = 40
+	defaultCalendarStartDay = 150
 
 [debug]
 	#
diff --git a/kubejs/server_scripts/mainServerScript.js b/kubejs/server_scripts/mainServerScript.js
@@ -49,6 +49,7 @@ LootJS.modifiers((event) => {
  * 2. Не работает очистка меди от меда.
  * 3. Не работает очистка меди от ржавчины.
  */
+/*
 ItemEvents.rightClicked(event => {
     const block = event.getTarget().block
     const item = event.getItem()
@@ -84,4 +85,4 @@ ItemEvents.rightClicked(event => {
             // todo
         }
     }
-})
+})*/

Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@`
`15`	`15`	`# This represents a number of days offset from January 1, 1000`
`16`	`16`	`# The default is (5 * daysInMonth) = 40, which starts at June 1, 1000 (with the default daysInMonth = 8)`
`17`	`17`	`#Range: > -1`
`18`		`- defaultCalendarStartDay = 40`
	`18`	`+ defaultCalendarStartDay = 150`
`19`	`19`
`20`	`20`	`[debug]`
`21`	`21`	`#`
Original file line number	Diff line number	Diff line change
`@@ -49,6 +49,7 @@ LootJS.modifiers((event) => {`
`49`	`49`	`* 2. Не работает очистка меди от меда.`
`50`	`50`	`* 3. Не работает очистка меди от ржавчины.`
`51`	`51`	`*/`
	`52`	`+/*`
`52`	`53`	`ItemEvents.rightClicked(event => {`
`53`	`54`	`const block = event.getTarget().block`
`54`	`55`	`const item = event.getItem()`
`@@ -84,4 +85,4 @@ ItemEvents.rightClicked(event => {`
`84`	`85`	`// todo`
`85`	`86`	`}`
`86`	`87`	`}`
`87`		`-})`
	`88`	`+})*/`