Merge branch '360-screenshots' into 1.8-dev

2018-01-16 13:47:55 +01:00
parent f8aa97405a 650cc1036d
commit c654d7bd2f
12 changed files with 425 additions and 4 deletions
--- a/src/main/resources/META-INF/replaymod_at.cfg
+++ b/src/main/resources/META-INF/replaymod_at.cfg
@@ -117,5 +117,8 @@ public net.minecraft.client.renderer.GlStateManager$FogState
 public net.minecraft.client.renderer.GlStateManager$BooleanState
 public net.minecraft.client.renderer.GlStateManager$BooleanState *

+# ScreenShotHelper
+public net.minecraft.util.ScreenShotHelper func_74290_a(Ljava/io/File;)Ljava/io/File; # getTimestampedPNGFileForDirectory
+
 # Example
 # public net.minecraft.package.ClassName func_some_id(Ljava/lang/Class;IZS)V # methodName
--- a/src/main/resources/assets/replaymod/lang
+++ b/src/main/resources/assets/replaymod/lang