Merge remote-tracking branch 'upstream/master'

cev-api · cev-api · commit 1771626ce721 · 2025-10-07T07:37:53.000+10:00
diff --git a/build.gradle b/build.gradle
@@ -141,7 +141,7 @@ jar {
 	inputs.property("archivesName", archivesName)
 	
 	from("LICENSE.txt") {
-		rename { "LICENSE-${archivesName}.txt" }
+		rename { "LICENSE-${archivesName.get()}.txt" }
 	}
 	
 	exclude("intentionally_untranslated.json")
diff --git a/src/main/resources/assets/wurst/post_effect/lsd.json b/src/main/resources/assets/wurst/post_effect/lsd.json
@@ -4,7 +4,7 @@
   },
   "passes": [
     {
-      "vertex_shader": "minecraft:post/sobel",
+      "vertex_shader": "minecraft:core/screenquad",
       "fragment_shader": "wurst:post/lsd",
       "inputs": [
         {
@@ -35,7 +35,7 @@
       }
     },
     {
-      "vertex_shader": "minecraft:post/blit",
+      "vertex_shader": "minecraft:core/screenquad",
       "fragment_shader": "minecraft:post/blit",
       "inputs": [
         {
diff --git a/src/main/resources/assets/wurst/shaders/core/fogless_lines.fsh b/src/main/resources/assets/wurst/shaders/core/fogless_lines.fsh
@@ -1,4 +1,4 @@
-#version 150
+#version 330
 
 #moj_import <minecraft:dynamictransforms.glsl>
 
diff --git a/src/main/resources/assets/wurst/shaders/core/fogless_lines.vsh b/src/main/resources/assets/wurst/shaders/core/fogless_lines.vsh
@@ -1,4 +1,4 @@
-#version 150
+#version 330
 
 #moj_import <minecraft:globals.glsl>
 #moj_import <minecraft:dynamictransforms.glsl>
diff --git a/src/main/resources/assets/wurst/shaders/post/lsd.fsh b/src/main/resources/assets/wurst/shaders/post/lsd.fsh
@@ -1,4 +1,4 @@
-#version 150
+#version 330
 
 #moj_import <minecraft:globals.glsl>
 

Original file line number	Diff line number	Diff line change
`@@ -141,7 +141,7 @@ jar {`
`141`	`141`	`inputs.property("archivesName", archivesName)`
`142`	`142`
`143`	`143`	`from("LICENSE.txt") {`
`144`		`- rename { "LICENSE-${archivesName}.txt" }`
	`144`	`+ rename { "LICENSE-${archivesName.get()}.txt" }`
`145`	`145`	`}`
`146`	`146`
`147`	`147`	`exclude("intentionally_untranslated.json")`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`	`},`
`5`	`5`	`"passes": [`
`6`	`6`	`{`
`7`		`- "vertex_shader": "minecraft:post/sobel",`
	`7`	`+ "vertex_shader": "minecraft:core/screenquad",`
`8`	`8`	`"fragment_shader": "wurst:post/lsd",`
`9`	`9`	`"inputs": [`
`10`	`10`	`{`
`@@ -35,7 +35,7 @@`
`35`	`35`	`}`
`36`	`36`	`},`
`37`	`37`	`{`
`38`		`- "vertex_shader": "minecraft:post/blit",`
	`38`	`+ "vertex_shader": "minecraft:core/screenquad",`
`39`	`39`	`"fragment_shader": "minecraft:post/blit",`
`40`	`40`	`"inputs": [`
`41`	`41`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-#version 150`
	`1`	`+#version 330`
`2`	`2`
`3`	`3`	`#moj_import <minecraft:dynamictransforms.glsl>`
`4`	`4`