diff --git a/gradle.properties b/gradle.properties index 96b57d2a6..8be827870 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,7 +2,7 @@ org.gradle.jvmargs=-Xmx1G # Mod properties -mod_version=1.95.0-beta +mod_version=1.95.1-beta # Minecraft properties mc_version=1.16.2 diff --git a/src/main/java/dan200/computercraft/api/IUpgradeBase.java b/src/main/java/dan200/computercraft/api/IUpgradeBase.java index c659ea5f5..06675b7ed 100644 --- a/src/main/java/dan200/computercraft/api/IUpgradeBase.java +++ b/src/main/java/dan200/computercraft/api/IUpgradeBase.java @@ -1,3 +1,8 @@ +/* + * This file is part of the public ComputerCraft API - http://www.computercraft.info + * Copyright Daniel Ratcliffe, 2011-2021. This API may be redistributed unmodified and in full only. + * For help using the API, and posting your mods, visit the forums at computercraft.info. + */ package dan200.computercraft.api; import dan200.computercraft.api.pocket.IPocketUpgrade; diff --git a/src/main/java/dan200/computercraft/shared/common/ColourableRecipe.java b/src/main/java/dan200/computercraft/shared/common/ColourableRecipe.java index 7d47ccdb3..87f84404e 100644 --- a/src/main/java/dan200/computercraft/shared/common/ColourableRecipe.java +++ b/src/main/java/dan200/computercraft/shared/common/ColourableRecipe.java @@ -65,11 +65,9 @@ public final class ColourableRecipe extends SpecialCraftingRecipe { if (stack.isEmpty()) { continue; } - - if (stack.getItem() instanceof IColouredItem) { - colourable = stack; - } else { - DyeColor dye = ColourUtils.getStackColour(stack); + else + { + DyeColor dye = ColourUtils.getStackColour( stack ); if( dye != null ) tracker.addColour( dye ); } } diff --git a/src/main/resources/data/computercraft/lua/rom/apis/gps.lua b/src/main/resources/data/computercraft/lua/rom/apis/gps.lua index 3be8906a5..8cbc63a78 100644 --- a/src/main/resources/data/computercraft/lua/rom/apis/gps.lua +++ b/src/main/resources/data/computercraft/lua/rom/apis/gps.lua @@ -83,9 +83,9 @@ end --- Tries to retrieve the computer or turtles own location. -- --- @tparam[opt] number timeout The maximum time taken to establish our --- position. Defaults to 2 seconds if not specified. --- @tparam[opt] boolean debug Print debugging messages +-- @tparam[opt=2] number timeout The maximum time in seconds taken to establish our +-- position. +-- @tparam[opt=false] boolean debug Print debugging messages -- @treturn[1] number This computer's `x` position. -- @treturn[1] number This computer's `y` position. -- @treturn[1] number This computer's `z` position. diff --git a/src/main/resources/data/computercraft/lua/rom/help/changelog.txt b/src/main/resources/data/computercraft/lua/rom/help/changelog.txt index 0c19ff76c..e08f993ff 100644 --- a/src/main/resources/data/computercraft/lua/rom/help/changelog.txt +++ b/src/main/resources/data/computercraft/lua/rom/help/changelog.txt @@ -1,3 +1,11 @@ +# New features in CC: Restitched 1.95.1 + +Several bug fixes: +* Command computers now drop items again. +* Restore crafting of disks with dyes. +* Fix CraftTweaker integrations for damageable items. +* Catch reflection errors in the generic peripheral system, resolving crashes with Botania. + # New features in CC: Restitched 1.95.0 * Optimise the paint program's initial render. diff --git a/src/main/resources/data/computercraft/lua/rom/help/whatsnew.txt b/src/main/resources/data/computercraft/lua/rom/help/whatsnew.txt index 802edff6f..1fdb9aa79 100644 --- a/src/main/resources/data/computercraft/lua/rom/help/whatsnew.txt +++ b/src/main/resources/data/computercraft/lua/rom/help/whatsnew.txt @@ -1,23 +1,9 @@ -New features in CC: Restitched 1.95.0 +New features in CC: Restitched 1.95.1 -* Optimise the paint program's initial render. -* Several documentation improvments (Gibbo3771, MCJack123). -* `fs.combine` now accepts multiple arguments. -* Add a setting (`bios.strict_globals`) to error when accidentally declaring a global. (Lupus590). -* Add an improved help viewer which allows scrolling up and down (MCJack123). -* Add `cc.strings` module, with utilities for wrapping text (Lupus590). -* The `clear` program now allows resetting the palette too (Luca0208). - -And several bug fixes: -* Fix memory leak in generic peripherals. -* Fix crash when a turtle is broken while being ticked. -* `textutils.*tabulate` now accepts strings _or_ numbers. -* We now deny _all_ local IPs, using the magic `$private` host. Previously the IPv6 loopback interface was not blocked. -* Fix crash when rendering monitors if the block has not yet been synced. You will need to regenerate the config file to apply this change. -* `read` now supports numpad enter (TheWireLord) -* Correctly handle HTTP redirects to URLs containing escape characters. -* Fix integer overflow in `os.epoch`. -* Allow using pickaxes (and other items) for turtle upgrades which have mod-specific NBT. -* Fix duplicate turtle/pocket upgrade recipes appearing in JEI. +Several bug fixes: +* Command computers now drop items again. +* Restore crafting of disks with dyes. +* Fix CraftTweaker integrations for damageable items. +* Catch reflection errors in the generic peripheral system, resolving crashes with Botania. Type "help changelog" to see the full version history.