Skip to content
This repository was archived by the owner on Jan 30, 2021. It is now read-only.

Commit f76acdc

Browse files
ThorsCrafterThorsCrafter
committed
Release 2.5
+ Release Cleanups
1 parent 57c4ff4 commit f76acdc

File tree

13 files changed

+44
-14
lines changed

13 files changed

+44
-14
lines changed

‎turbineControl_v2/src/beta.ver

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2.5-beta04
1+
2.5-beta

‎turbineControl_v2/src/changelog/changelogDE.txt

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,22 @@
11
****************************************************************
22
-- Reaktor- und Turbinenprogramm von Thor_s_Crafter --
33
-- Komplettes Changelog --
4-
-- Aktuelle Version: 2.4 --
4+
-- Aktuelle Version: 2.5 --
5+
****************************************************************
6+
Version 2.5
7+
- Automatische Updates implementiert
8+
- Git Downloader & Installer Updates
9+
- Readme in Github aktualisiert
10+
- Optionen Reworks
11+
- Energiespeicher werden nun anhand der Methode
12+
getEnergyStored() erkannt
13+
- Bugfixes:
14+
> Anzeigebugs
15+
> Event Handling Fixes
16+
> Buttons
17+
> Hauptmenue Bugs
18+
> Start Bugs
19+
> Eine Menge Code-Cleanups
520
****************************************************************
621
Version 2.4
722
- Github Downloader hinzugefuegt (ersetzt installerUpdate)

‎turbineControl_v2/src/changelog/changelogEn.txt

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,22 @@
11
****************************************************************
22
-- Reactor- und Turbine control by Thor_s_Crafter --
33
-- Complete Changelog --
4-
-- Current Version: 2.4 --
4+
-- Current Version: 2.5 --
5+
****************************************************************
6+
Version 2.5
7+
- Reimplemented automatic updates
8+
- Git Downloader & Installer Updates
9+
- Updated Readme in Github
10+
- Option Reworks
11+
- Energy Storage is now being detected by the function
12+
getEnergyStored()
13+
- Bugfixes:
14+
> Visual Bugfixes
15+
> Event Handling Fixes
16+
> Buttons
17+
> Hauptmenu Bugs
18+
> Start Bugs
19+
> Lots of Code-Cleanups
520
****************************************************************
621
Version 2.4
722
- Added Github Downloader (replaces installerUpdate)

‎turbineControl_v2/src/config/touchpoint.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
-- Reaktor- and Turbinen control by Thor_s_Crafter --
2-
-- Version 2.4 --
2+
-- Version 2.5 --
33
-- Touchpoint API by Lyqyd - Slightly changed --
44

55
local file = fs.open("/reactor-turbine-program/config/options.txt","r")

‎turbineControl_v2/src/install/github_downloader.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
-- Reactor- und Turbine control by Thor_s_Crafter --
2-
-- Betaversion downloader (GitHub) --
2+
-- Init Program Downloader (GitHub) --
33

44

55
--===== Local variables =====

‎turbineControl_v2/src/install/installer.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
-- Reactor- und Turbine control by Thor_s_Crafter --
2-
-- Version 2.4 --
2+
-- Version 2.5 --
33
-- Installer (Deutsch) --
44

55

‎turbineControl_v2/src/install/installerEn.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
-- Reactor- und Turbine control by Thor_s_Crafter --
2-
-- Version 2.4 --
2+
-- Version 2.5 --
33
-- Installer (English) --
44

55
--Variables

‎turbineControl_v2/src/program/editOptions.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
-- Reactor- und Turbine control by Thor_s_Crafter --
2-
-- Version 2.4 --
2+
-- Version 2.5 --
33
-- Options menu --
44

55
--Loads the touchpoint and input APIs

‎turbineControl_v2/src/program/reactorControl.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
-- Reactor- und Turbine control by Thor_s_Crafter --
2-
-- Version 2.4 --
2+
-- Version 2.5 --
33
-- Reactor control --
44

55
--Loads the touchpoint and input APIs

‎turbineControl_v2/src/program/turbineControl.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
-- Reactor- und Turbine control by Thor_s_Crafter --
2-
-- Version 2.4 --
2+
-- Version 2.5 --
33
-- Turbine control --
44

55
--Loads the touchpoint API

‎turbineControl_v2/src/release.ver

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2.4-release
1+
2.5-release

‎turbineControl_v2/src/start/menu.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
-- Reaktor- und Turbinenprogramm von Thor_s_Crafter --
2-
-- Version 2.3 --
2+
-- Version 2.5 --
33
-- Hauptmenue --
44

55
--Loads the Touchpoint API (by Lyqyd)

‎turbineControl_v2/src/start/start.lua

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
-- Reactor- and Turbine control by Thor_s_Crafter --
2-
-- Version 2.4 --
2+
-- Version 2.5 --
33
-- Start program --
44

55
--========== Global variables for all program parts ==========
@@ -97,7 +97,7 @@ function checkUpdates()
9797
--Check current branch (release or beta)
9898
local currBranch = ""
9999
local tmpString = string.sub(version,5,5)
100-
if tmpString == "" then
100+
if tmpString == "" or tmpString == nil then
101101
currBranch = "master"
102102
elseif tmpString == "b" then
103103
currBranch = "beta"

0 commit comments

Comments
 (0)