diff --git a/Gemfile b/Gemfile index ba96be4..f9f8e37 100644 --- a/Gemfile +++ b/Gemfile @@ -3,6 +3,6 @@ source "https://rubygems.org" gem "cyberarm_engine" group :packaging do - gem "ocra" - gem "releasy", github: "gosu/releasy" + gem "ocran" + # gem "releasy", path: "../releasy" end diff --git a/Gemfile.lock b/Gemfile.lock index 29dc3d6..32a66f7 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,17 +1,6 @@ -GIT - remote: https://github.com/gosu/releasy.git - revision: e8a24c079c4930c6ddbab17fc444027ba41491ca - specs: - releasy (0.2.3) - bundler (>= 1.2.1) - cri (~> 2.1.0) - ocra (~> 1.3.0) - rake (>= 0.9.2.2) - GEM remote: https://rubygems.org/ specs: - cri (2.1.0) cyberarm_engine (0.24.1) excon (~> 0.88) gosu (~> 1.1) @@ -19,18 +8,14 @@ GEM excon (0.109.0) gosu (1.4.6) gosu_more_drawables (0.3.1) - ocra (1.3.11) - rake (13.1.0) + ocran (1.3.15) PLATFORMS x64-mingw-ucrt - x64-mingw32 - x86_64-linux DEPENDENCIES cyberarm_engine - ocra - releasy! + ocran BUNDLED WITH 2.5.3 diff --git a/lib/version.rb b/lib/version.rb index d57f42a..05c0743 100644 --- a/lib/version.rb +++ b/lib/version.rb @@ -1,6 +1,6 @@ module TAC NAME = "TimeCrafters Configuration Tool" - RELEASE_DATE = "2024-01-18" # ISO 8601 Date of version release + RELEASE_DATE = "2024-01-19" # ISO 8601 Date of version release VERSION = "0.8.0" RELEASE_NAME = "BETA" end diff --git a/timecrafters_configuration_tool.rb b/timecrafters_configuration_tool.rb index 7e77067..7161fe0 100644 --- a/timecrafters_configuration_tool.rb +++ b/timecrafters_configuration_tool.rb @@ -1,5 +1,5 @@ begin - raise LoadError if defined?(Ocra) + raise LoadError if defined?(Ocra) || defined?(Ocran) require_relative "../cyberarm_engine/lib/cyberarm_engine" rescue LoadError require "cyberarm_engine" @@ -73,7 +73,7 @@ require_relative "lib/game_clock/net/packet" USE_REDESIGN = ARGV.include?("--redesign") BORDERLESS = ARGV.include?("--borderless") -if not defined?(Ocra) +unless defined?(Ocra) || defined?(Ocran) TAC::Window.new(width: (Gosu.screen_width * 0.8).round, height: (Gosu.screen_height * 0.8).round, resizable: true, borderless: BORDERLESS).show end