From 815ddbfe127301f8586599f1c5483a09f9a6374a Mon Sep 17 00:00:00 2001 From: kekzdealer Date: Tue, 18 Feb 2020 12:32:37 +0100 Subject: one more TFFT cell, fixed press/alloying recipes, improved fuel cells --- config/splash.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'config/splash.properties') diff --git a/config/splash.properties b/config/splash.properties index 49794cfda6..e6ad6c72ce 100644 --- a/config/splash.properties +++ b/config/splash.properties @@ -1,5 +1,5 @@ #Splash screen properties -#Sun Nov 24 18:42:01 CET 2019 +#Tue Feb 18 12:20:53 CET 2020 logoTexture=textures/gui/title/mojang.png background=0xFFFFFF font=0x0 -- cgit From ba8d49bd6c77d69630135c887272e9d0c8c7311d Mon Sep 17 00:00:00 2001 From: kekzdealer Date: Tue, 18 Feb 2020 16:01:52 +0100 Subject: Fixed Item Server structure check. Wrote better doc for the MIH --- config/splash.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'config/splash.properties') diff --git a/config/splash.properties b/config/splash.properties index e6ad6c72ce..e4d7b3edba 100644 --- a/config/splash.properties +++ b/config/splash.properties @@ -1,5 +1,5 @@ #Splash screen properties -#Tue Feb 18 12:20:53 CET 2020 +#Tue Feb 18 15:08:17 CET 2020 logoTexture=textures/gui/title/mojang.png background=0xFFFFFF font=0x0 -- cgit From e3568bc7c726a8893b45ab15fb984a88ebab1a5c Mon Sep 17 00:00:00 2001 From: kekzdealer Date: Tue, 18 Feb 2020 16:50:20 +0100 Subject: Improved TE IS IO port code but it's still not working --- config/splash.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'config/splash.properties') diff --git a/config/splash.properties b/config/splash.properties index e4d7b3edba..7b717de411 100644 --- a/config/splash.properties +++ b/config/splash.properties @@ -1,5 +1,5 @@ #Splash screen properties -#Tue Feb 18 15:08:17 CET 2020 +#Tue Feb 18 16:45:12 CET 2020 logoTexture=textures/gui/title/mojang.png background=0xFFFFFF font=0x0 -- cgit From 03a0e592bd88a5609c45b0f605ab38ac07047c7f Mon Sep 17 00:00:00 2001 From: kekzdealer Date: Wed, 4 Mar 2020 15:18:44 +0100 Subject: removed WIP things for v0.2.3 bug fix release --- config/splash.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'config/splash.properties') diff --git a/config/splash.properties b/config/splash.properties index 7b717de411..17de033fc3 100644 --- a/config/splash.properties +++ b/config/splash.properties @@ -1,5 +1,5 @@ #Splash screen properties -#Tue Feb 18 16:45:12 CET 2020 +#Wed Mar 04 15:14:27 CET 2020 logoTexture=textures/gui/title/mojang.png background=0xFFFFFF font=0x0 -- cgit From 60554a28fc5b2d0753a8c63935b00b9ba84ea058 Mon Sep 17 00:00:00 2001 From: kekzdealer Date: Wed, 11 Mar 2020 20:36:28 +0100 Subject: re-enabled WIP content for further dev work --- config/splash.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'config/splash.properties') diff --git a/config/splash.properties b/config/splash.properties index 17de033fc3..7f5845bd66 100644 --- a/config/splash.properties +++ b/config/splash.properties @@ -1,5 +1,5 @@ #Splash screen properties -#Wed Mar 04 15:14:27 CET 2020 +#Tue Mar 10 20:14:59 CET 2020 logoTexture=textures/gui/title/mojang.png background=0xFFFFFF font=0x0 -- cgit From 1164ce897327ccd9103a05d99103314d44b06138 Mon Sep 17 00:00:00 2001 From: Christina Berchtold Date: Sun, 29 Mar 2020 21:34:34 +0200 Subject: added first code to make multi hatch auto-output --- config/splash.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'config/splash.properties') diff --git a/config/splash.properties b/config/splash.properties index 7f5845bd66..8e6a55cf2e 100644 --- a/config/splash.properties +++ b/config/splash.properties @@ -1,5 +1,5 @@ #Splash screen properties -#Tue Mar 10 20:14:59 CET 2020 +#Sun Mar 29 21:13:56 CEST 2020 logoTexture=textures/gui/title/mojang.png background=0xFFFFFF font=0x0 -- cgit From 7f927621de00e55ad6cedca256a6f54cfa12c2be Mon Sep 17 00:00:00 2001 From: Christina Berchtold Date: Sun, 19 Apr 2020 21:06:33 +0200 Subject: New TC jar textures --- config/splash.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'config/splash.properties') diff --git a/config/splash.properties b/config/splash.properties index 8e6a55cf2e..8953d81490 100644 --- a/config/splash.properties +++ b/config/splash.properties @@ -1,5 +1,5 @@ #Splash screen properties -#Sun Mar 29 21:13:56 CEST 2020 +#Mon Apr 13 18:20:02 CEST 2020 logoTexture=textures/gui/title/mojang.png background=0xFFFFFF font=0x0 -- cgit From d48674f9c4243fe4439999e59c798a13113f3037 Mon Sep 17 00:00:00 2001 From: Christina Berchtold Date: Thu, 23 Apr 2020 22:06:32 +0200 Subject: Fixed Multi Hatch ignoring circuit in controller when drained from --- config/splash.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'config/splash.properties') diff --git a/config/splash.properties b/config/splash.properties index 8953d81490..2e2172118a 100644 --- a/config/splash.properties +++ b/config/splash.properties @@ -1,5 +1,5 @@ #Splash screen properties -#Mon Apr 13 18:20:02 CEST 2020 +#Thu Apr 23 20:50:25 CEST 2020 logoTexture=textures/gui/title/mojang.png background=0xFFFFFF font=0x0 -- cgit From 1edc79e2b1f38c58bb8f978131acb8a83f8dbb63 Mon Sep 17 00:00:00 2001 From: Christina Berchtold Date: Fri, 24 Apr 2020 00:36:40 +0200 Subject: Multi Hatch now pushes 1000L/s for each fluid into adjacent tanks --- config/splash.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'config/splash.properties') diff --git a/config/splash.properties b/config/splash.properties index 2e2172118a..419cbf36d7 100644 --- a/config/splash.properties +++ b/config/splash.properties @@ -1,5 +1,5 @@ #Splash screen properties -#Thu Apr 23 20:50:25 CEST 2020 +#Fri Apr 24 00:33:58 CEST 2020 logoTexture=textures/gui/title/mojang.png background=0xFFFFFF font=0x0 -- cgit From ea7710559a16fb4ad47d64e812ebbabfece73115 Mon Sep 17 00:00:00 2001 From: Christina Berchtold Date: Fri, 24 Apr 2020 20:03:26 +0200 Subject: Multi Hatch no longer ticks when not part of a TFFT --- config/splash.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'config/splash.properties') diff --git a/config/splash.properties b/config/splash.properties index 419cbf36d7..92809cfd4e 100644 --- a/config/splash.properties +++ b/config/splash.properties @@ -1,5 +1,5 @@ #Splash screen properties -#Fri Apr 24 00:33:58 CEST 2020 +#Fri Apr 24 19:55:31 CEST 2020 logoTexture=textures/gui/title/mojang.png background=0xFFFFFF font=0x0 -- cgit From 1e447aa43cddf6d533a40148568e6e435bdf6c78 Mon Sep 17 00:00:00 2001 From: Christina Berchtold Date: Fri, 24 Apr 2020 21:11:29 +0200 Subject: Item Server checkMachine() fixed --- config/splash.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'config/splash.properties') diff --git a/config/splash.properties b/config/splash.properties index 92809cfd4e..8ed4eaef3d 100644 --- a/config/splash.properties +++ b/config/splash.properties @@ -1,5 +1,5 @@ #Splash screen properties -#Fri Apr 24 19:55:31 CEST 2020 +#Fri Apr 24 21:04:49 CEST 2020 logoTexture=textures/gui/title/mojang.png background=0xFFFFFF font=0x0 -- cgit From 27f5a01fd75c7019f220bdc44083766c27cf4180 Mon Sep 17 00:00:00 2001 From: Christina Berchtold Date: Fri, 24 Apr 2020 22:00:02 +0200 Subject: shelved ItemServer for next release --- config/splash.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'config/splash.properties') diff --git a/config/splash.properties b/config/splash.properties index 8ed4eaef3d..0caa65e4ba 100644 --- a/config/splash.properties +++ b/config/splash.properties @@ -1,5 +1,5 @@ #Splash screen properties -#Fri Apr 24 21:04:49 CEST 2020 +#Fri Apr 24 21:49:40 CEST 2020 logoTexture=textures/gui/title/mojang.png background=0xFFFFFF font=0x0 -- cgit From 34fb2f0b55c9295c116b1244224918624e56d096 Mon Sep 17 00:00:00 2001 From: Christina Berchtold Date: Fri, 24 Apr 2020 23:39:52 +0200 Subject: Thaumcraft jar progress --- config/splash.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'config/splash.properties') diff --git a/config/splash.properties b/config/splash.properties index 0caa65e4ba..fb0de50cab 100644 --- a/config/splash.properties +++ b/config/splash.properties @@ -1,5 +1,5 @@ #Splash screen properties -#Fri Apr 24 21:49:40 CEST 2020 +#Fri Apr 24 23:29:29 CEST 2020 logoTexture=textures/gui/title/mojang.png background=0xFFFFFF font=0x0 -- cgit From 9400f69489b43ac9b8a303323c4505b6e2b8852b Mon Sep 17 00:00:00 2001 From: Christina Berchtold Date: Fri, 24 Apr 2020 23:48:08 +0200 Subject: fixed texture name typo --- config/splash.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'config/splash.properties') diff --git a/config/splash.properties b/config/splash.properties index fb0de50cab..acaa09efd1 100644 --- a/config/splash.properties +++ b/config/splash.properties @@ -1,5 +1,5 @@ #Splash screen properties -#Fri Apr 24 23:29:29 CEST 2020 +#Fri Apr 24 23:40:15 CEST 2020 logoTexture=textures/gui/title/mojang.png background=0xFFFFFF font=0x0 -- cgit From d42f4996255a4e11b2c0b5beabaf24be0d870fcc Mon Sep 17 00:00:00 2001 From: Christina Berchtold Date: Sat, 25 Apr 2020 18:35:08 +0200 Subject: improved jars are correctly placed after picking them up. Also cleaned up recipe registration --- config/splash.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'config/splash.properties') diff --git a/config/splash.properties b/config/splash.properties index acaa09efd1..be3d3ba683 100644 --- a/config/splash.properties +++ b/config/splash.properties @@ -1,5 +1,5 @@ #Splash screen properties -#Fri Apr 24 23:40:15 CEST 2020 +#Sat Apr 25 17:27:56 CEST 2020 logoTexture=textures/gui/title/mojang.png background=0xFFFFFF font=0x0 -- cgit From d6d6dfa242d87c4488777887c31a3e6f66329946 Mon Sep 17 00:00:00 2001 From: Christina Berchtold Date: Sat, 25 Apr 2020 22:07:31 +0200 Subject: crafting recipes and research for jars --- config/splash.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'config/splash.properties') diff --git a/config/splash.properties b/config/splash.properties index be3d3ba683..581433d8e2 100644 --- a/config/splash.properties +++ b/config/splash.properties @@ -1,5 +1,5 @@ #Splash screen properties -#Sat Apr 25 17:27:56 CEST 2020 +#Sat Apr 25 21:51:10 CEST 2020 logoTexture=textures/gui/title/mojang.png background=0xFFFFFF font=0x0 -- cgit From c67bff76ebde860f368328c5e3b23caf1145a2a3 Mon Sep 17 00:00:00 2001 From: kekzdealer Date: Sun, 26 Apr 2020 01:51:39 +0200 Subject: fixed recipes for jars and wrote research lore --- config/splash.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'config/splash.properties') diff --git a/config/splash.properties b/config/splash.properties index 581433d8e2..a918283a20 100644 --- a/config/splash.properties +++ b/config/splash.properties @@ -1,5 +1,5 @@ #Splash screen properties -#Sat Apr 25 21:51:10 CEST 2020 +#Sun Apr 26 01:45:46 CEST 2020 logoTexture=textures/gui/title/mojang.png background=0xFFFFFF font=0x0 -- cgit From 40ec9e071c8b2618dfd8332aea76590784f0ebfe Mon Sep 17 00:00:00 2001 From: kekzdealer Date: Sun, 26 Apr 2020 14:16:38 +0200 Subject: sharing with bart --- config/splash.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'config/splash.properties') diff --git a/config/splash.properties b/config/splash.properties index a918283a20..f0cb69ed0a 100644 --- a/config/splash.properties +++ b/config/splash.properties @@ -1,5 +1,5 @@ #Splash screen properties -#Sun Apr 26 01:45:46 CEST 2020 +#Sun Apr 26 14:01:09 CEST 2020 logoTexture=textures/gui/title/mojang.png background=0xFFFFFF font=0x0 -- cgit From d0ff8c1c6b6dbe4b6f3ce33a380ee837632a9507 Mon Sep 17 00:00:00 2001 From: Christina Berchtold Date: Mon, 4 May 2020 00:21:42 +0200 Subject: visiting Lucy --- config/splash.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'config/splash.properties') diff --git a/config/splash.properties b/config/splash.properties index f0cb69ed0a..2877e2c1c9 100644 --- a/config/splash.properties +++ b/config/splash.properties @@ -1,5 +1,5 @@ #Splash screen properties -#Sun Apr 26 14:01:09 CEST 2020 +#Fri May 01 19:42:05 CEST 2020 logoTexture=textures/gui/title/mojang.png background=0xFFFFFF font=0x0 -- cgit From 177bdcff328e89dc0196c660bb34c74dfa9ab033 Mon Sep 17 00:00:00 2001 From: kekzdealer Date: Wed, 6 May 2020 22:24:36 +0200 Subject: Setting up IntelliJ files --- config/splash.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'config/splash.properties') diff --git a/config/splash.properties b/config/splash.properties index 2877e2c1c9..436b2493e9 100644 --- a/config/splash.properties +++ b/config/splash.properties @@ -1,5 +1,5 @@ #Splash screen properties -#Fri May 01 19:42:05 CEST 2020 +#Wed May 06 22:18:00 CEST 2020 logoTexture=textures/gui/title/mojang.png background=0xFFFFFF font=0x0 -- cgit From a13afd326baa978b789c7f7e1c91eba62017a169 Mon Sep 17 00:00:00 2001 From: kekzdealer Date: Thu, 7 May 2020 14:01:44 +0200 Subject: removing /config/ from repo --- config/splash.properties | 14 -------------- 1 file changed, 14 deletions(-) delete mode 100644 config/splash.properties (limited to 'config/splash.properties') diff --git a/config/splash.properties b/config/splash.properties deleted file mode 100644 index 436b2493e9..0000000000 --- a/config/splash.properties +++ /dev/null @@ -1,14 +0,0 @@ -#Splash screen properties -#Wed May 06 22:18:00 CEST 2020 -logoTexture=textures/gui/title/mojang.png -background=0xFFFFFF -font=0x0 -barBackground=0xFFFFFF -barBorder=0xC0C0C0 -rotate=false -bar=0xCB3D35 -enabled=true -resourcePackPath=resources -logoOffset=0 -forgeTexture=fml\:textures/gui/forge.gif -fontTexture=textures/font/ascii.png -- cgit