From 143a76dd8b380f85dad4fee6359b5a17022feccb Mon Sep 17 00:00:00 2001 From: Alkalus <3060479+draknyte1@users.noreply.github.com> Date: Sat, 29 Jan 2022 13:07:43 +0000 Subject: Added Mob Mentality. Added perks to sleeping. Added Magic Feather. --- .../assets/miscutils/textures/items/magicfeather.png | Bin 0 -> 324 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 src/main/resources/assets/miscutils/textures/items/magicfeather.png (limited to 'src/main/resources') diff --git a/src/main/resources/assets/miscutils/textures/items/magicfeather.png b/src/main/resources/assets/miscutils/textures/items/magicfeather.png new file mode 100644 index 0000000000..634529b925 Binary files /dev/null and b/src/main/resources/assets/miscutils/textures/items/magicfeather.png differ -- cgit From e7fb530caf15236026808ffaecaf1b2cae140776 Mon Sep 17 00:00:00 2001 From: Alkalus <3060479+draknyte1@users.noreply.github.com> Date: Sat, 29 Jan 2022 13:33:21 +0000 Subject: Re-allow removal of debuffs when sleeping. Localized chat strings. --- src/main/resources/assets/miscutils/lang/en_US.lang | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'src/main/resources') diff --git a/src/main/resources/assets/miscutils/lang/en_US.lang b/src/main/resources/assets/miscutils/lang/en_US.lang index a3639062f8..06b47f381e 100644 --- a/src/main/resources/assets/miscutils/lang/en_US.lang +++ b/src/main/resources/assets/miscutils/lang/en_US.lang @@ -3368,4 +3368,10 @@ item.FrothMonaziteflotation.name=Monazite Flotation Froth Cell //Added 18/12/21 item.BasicGenericChemItem.13.name=Formaldehyde Catalyst -item.hydrogenchloridemix.name=Hydrogen Chlorine Mix \ No newline at end of file +item.hydrogenchloridemix.name=Hydrogen Chlorine Mix + +//Added 29/01/22 +sleep.event.okay=You slept well and now feel a little better. +sleep.event.good=You slept well and now feel much better. +sleep.event.wellrested=You feel really well rested. +sleep.event.downsides=The downsides of life no longer effect you. \ No newline at end of file -- cgit From 228ddd39273b2ac38350764d29982519e27761c1 Mon Sep 17 00:00:00 2001 From: Alkalus <3060479+draknyte1@users.noreply.github.com> Date: Sat, 29 Jan 2022 14:54:57 +0000 Subject: Fixed Magic Feather death handling. Improved Magic Feather beacon handling. --- src/main/resources/assets/miscutils/lang/en_US.lang | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src/main/resources') diff --git a/src/main/resources/assets/miscutils/lang/en_US.lang b/src/main/resources/assets/miscutils/lang/en_US.lang index 06b47f381e..c7d3e9a938 100644 --- a/src/main/resources/assets/miscutils/lang/en_US.lang +++ b/src/main/resources/assets/miscutils/lang/en_US.lang @@ -3374,4 +3374,5 @@ item.hydrogenchloridemix.name=Hydrogen Chlorine Mix sleep.event.okay=You slept well and now feel a little better. sleep.event.good=You slept well and now feel much better. sleep.event.wellrested=You feel really well rested. -sleep.event.downsides=The downsides of life no longer effect you. \ No newline at end of file +sleep.event.downsides=The downsides of life no longer effect you. +item.miscutils:magicfeather.name=Magical Feather \ No newline at end of file -- cgit From e77484a62ce2a5c20a6c731147aed7f38098f35d Mon Sep 17 00:00:00 2001 From: Alkalus <3060479+draknyte1@users.noreply.github.com> Date: Sat, 29 Jan 2022 16:59:59 +0000 Subject: Added new crop. Added Wireless Charger locking. Fixed Cyclotron leaving bad input stacks. Improve Block localization. --- .../miscutils/textures/blocks/crop/blockCrop.Force.1.png | Bin 0 -> 209 bytes .../miscutils/textures/blocks/crop/blockCrop.Force.2.png | Bin 0 -> 547 bytes .../miscutils/textures/blocks/crop/blockCrop.Force.3.png | Bin 0 -> 782 bytes .../miscutils/textures/blocks/crop/blockCrop.Force.4.png | Bin 0 -> 701 bytes .../miscutils/textures/blocks/crop/blockCrop.Force.5.png | Bin 0 -> 925 bytes 5 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 src/main/resources/assets/miscutils/textures/blocks/crop/blockCrop.Force.1.png create mode 100644 src/main/resources/assets/miscutils/textures/blocks/crop/blockCrop.Force.2.png create mode 100644 src/main/resources/assets/miscutils/textures/blocks/crop/blockCrop.Force.3.png create mode 100644 src/main/resources/assets/miscutils/textures/blocks/crop/blockCrop.Force.4.png create mode 100644 src/main/resources/assets/miscutils/textures/blocks/crop/blockCrop.Force.5.png (limited to 'src/main/resources') diff --git a/src/main/resources/assets/miscutils/textures/blocks/crop/blockCrop.Force.1.png b/src/main/resources/assets/miscutils/textures/blocks/crop/blockCrop.Force.1.png new file mode 100644 index 0000000000..87b1b2b7d3 Binary files /dev/null and b/src/main/resources/assets/miscutils/textures/blocks/crop/blockCrop.Force.1.png differ diff --git a/src/main/resources/assets/miscutils/textures/blocks/crop/blockCrop.Force.2.png b/src/main/resources/assets/miscutils/textures/blocks/crop/blockCrop.Force.2.png new file mode 100644 index 0000000000..631045a936 Binary files /dev/null and b/src/main/resources/assets/miscutils/textures/blocks/crop/blockCrop.Force.2.png differ diff --git a/src/main/resources/assets/miscutils/textures/blocks/crop/blockCrop.Force.3.png b/src/main/resources/assets/miscutils/textures/blocks/crop/blockCrop.Force.3.png new file mode 100644 index 0000000000..e987c60374 Binary files /dev/null and b/src/main/resources/assets/miscutils/textures/blocks/crop/blockCrop.Force.3.png differ diff --git a/src/main/resources/assets/miscutils/textures/blocks/crop/blockCrop.Force.4.png b/src/main/resources/assets/miscutils/textures/blocks/crop/blockCrop.Force.4.png new file mode 100644 index 0000000000..67965b0c01 Binary files /dev/null and b/src/main/resources/assets/miscutils/textures/blocks/crop/blockCrop.Force.4.png differ diff --git a/src/main/resources/assets/miscutils/textures/blocks/crop/blockCrop.Force.5.png b/src/main/resources/assets/miscutils/textures/blocks/crop/blockCrop.Force.5.png new file mode 100644 index 0000000000..c587e84b78 Binary files /dev/null and b/src/main/resources/assets/miscutils/textures/blocks/crop/blockCrop.Force.5.png differ -- cgit