Skip to content

Commit

Permalink
Merge branch 'master' into mc-1.14.x
Browse files Browse the repository at this point in the history
  • Loading branch information
SquidDev committed Oct 4, 2019
2 parents f7781de + c802290 commit 3ea2d6a
Show file tree
Hide file tree
Showing 3 changed files with 25 additions and 3 deletions.
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Mod properties
mod_version=1.84.1
mod_version=1.85.0

# Minecraft properties
mc_version=1.14.4
Expand Down
13 changes: 13 additions & 0 deletions src/main/resources/data/computercraft/lua/rom/help/changelog.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,16 @@
# New features in CC: Tweaked 1.85.0

* Window.reposition now allows changing the redirect buffer
* Add cc.completion and cc.shell.completion modules
* command.exec also returns the number of affected objects, when exposed by the game.

And several bug fixes:
* Change how turtle mining drops are handled, improving compatibility with some mods.
* Fix several GUI desyncs after a turtle moves.
* Fix os.day/os.time using the incorrect world time.
* Prevent wired modems dropping incorrectly.
* Fix mouse events not firing within the computer GUI.

# New features in CC: Tweaked 1.84.1

* Update to latest Forge
Expand Down
13 changes: 11 additions & 2 deletions src/main/resources/data/computercraft/lua/rom/help/whatsnew.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,14 @@
New features in CC: Tweaked 1.84.1
New features in CC: Tweaked 1.85.0

* Update to latest Forge
* Window.reposition now allows changing the redirect buffer
* Add cc.completion and cc.shell.completion modules
* command.exec also returns the number of affected objects, when exposed by the game.

And several bug fixes:
* Change how turtle mining drops are handled, improving compatibility with some mods.
* Fix several GUI desyncs after a turtle moves.
* Fix os.day/os.time using the incorrect world time.
* Prevent wired modems dropping incorrectly.
* Fix mouse events not firing within the computer GUI.

Type "help changelog" to see the full version history.

0 comments on commit 3ea2d6a

Please sign in to comment.