Merge branch 'master' into maintenance/6.17.5

renpy/__init__.py

@@ -40,10 +40,10 @@ except ImportError:
     vc_version = 0
 
 # The tuple giving the version number.
-version_tuple = (6, 18, 0, vc_version)
+version_tuple = (6, 17, 5, vc_version)
 
 # The name of this version.
-version_name = "TBD."
+version_name = "In This Decade..."
 
 # A verbose string giving the version.
 version = "Ren'Py " + ".".join(str(i) for i in version_tuple)

renpy/common/00keymap.rpy

@@ -102,7 +102,7 @@ init -1600 python:
         )
 
     # Should we use the autoreload system?
-    config.autoreload = True
+    config.autoreload = False
 
 init -1600 python:
 

renpy/parser.py

@@ -1872,21 +1872,21 @@ def screen_statement(l, loc):
     return rv
 
 
-@statement("screen2")
-def screen2_statement(l, loc):
-
-    # The guts of screen language parsing is in screenlang.py. It
-    # assumes we ate the "screen" keyword before it's called.
-    screen = renpy.sl2.slparser.parse_screen(l, loc)
-
-    l.advance()
-
-    rv = ast.Screen(loc, screen)
-
-    if not l.init:
-        rv = ast.Init(loc, [ rv ], -500)
-
-    return rv
+# @statement("screen2")
+# def screen2_statement(l, loc):
+#
+#     # The guts of screen language parsing is in screenlang.py. It
+#     # assumes we ate the "screen" keyword before it's called.
+#     screen = renpy.sl2.slparser.parse_screen(l, loc)
+#
+#     l.advance()
+#
+#     rv = ast.Screen(loc, screen)
+#
+#     if not l.init:
+#         rv = ast.Init(loc, [ rv ], -500)
+#
+#     return rv
 
 
 def translate_strings(init_loc, language, l):

sphinx/source/config.rst

@@ -654,7 +654,7 @@ Rarely or Internally Used
     released games, but setting it to a number will allow for
     automated demonstrations of games without much human interaction.
 
-.. var:: config.autoreload = True
+.. var:: config.autoreload = False
 
     If true, shift+R will toggle automatic reloading. When automatic
     reloading is enabled, Ren'Py will reload the game whenever a used