Instapassed gust_0 from 2023-12-27

This reverts commit 28cbd9249a.

.github/workflows/create-pack.yml

@@ -8,14 +8,12 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
-
     - name: Get branch name
       id: branch-name
-      uses: tj-actions/branch-names@v5.2
+      uses: tj-actions/branch-names@v6.4
 
     - name: Create Pack
-      uses: appleboy/ssh-action@master
+      uses: appleboy/ssh-action@v0.1.7
       with:
         host: ${{ secrets.HOST }}
         USERNAME: ${{ secrets.USERNAME }}

LICENSE.txt

@@ -1,12 +1,24 @@
-FAITHFUL RESOURCE PACK LICENSE
-Version 2, 27th September 2022
+FAITHFUL LICENSE
+Version 3 - 20th February 2023
 
 Copyright © Faithful Resource Pack
 
-ALL FAITHFUL ASSETS ARE DISTRIBUTING WITH THESE GUIDELINES BELOW:
+
+You may do the following:
 
 
-Requirements if you are distributing any assets by us:
+1: Use our work as placeholders.
+
+2: Use our work as a base or reference for your own content (e.g. modded textures, content creator edits).
+
+3: Use a few textures that you cannot properly make, such as painting or particle textures.
+
+4: Distribute a modified copy of a pack as a content creator with your videos or streams.
+
+5: Use our work for adventure maps, server resource packs, mod textures, or data packs.
+
+
+By doing any of the above, you agree to follow these requirements:
 
 
 1: Give clear credit in an appropriate place (e.g. video descriptions, pack.mcmetas, listing descriptions).
@@ -14,52 +26,31 @@ Requirements if you are distributing any assets by us:
 2: Link back to our website, which you can find here:
 	https://faithfulpack.net/
 
-3: Be honest about what you are using and use common sense. Basically, don't take credit for stuff you didn't make and give proper attribution to any textures you use or modify. 
+3: Don't take credit for work you didn't make and always give proper attribution to any work you use or modify. In addition, try to be somewhat specific about what you're using, as "GUI originally from Faithful 32x" works a lot better than "some textures from Faithful". Just be honest about what you're using, use common sense when in doubt, and you'll be fine.
 
-4: Do not monetise under any circumstances, including use of link shorteners. Any content with assets made by us must be entirely free and open sourced, to uphold our standards. This includes redistribution on the Bedrock Marketplace or locking behind a paywall (e.g. Patreon). Taking voluntary donations or participating in reward programs (e.g. CurseForge points, YouTube monetization) is allowed.
+4: Do not monetize content that contains any of our work, modified or not, under any circumstances. This includes locking your content behind a paywall (including the Minecraft Marketplace) or monetizing download links. Taking voluntary donations is still allowed, but if it feels like you're profiting off our work don't do it.
 
-5: Don't make your projects look official when they aren't. Examples of this would be copying our branding, marking a project as "official", etc, in a way that would confuse the average viewer into believing a project is official when it isn't.
+5: Don't make your projects look official when they aren't. Examples of this behavior would include copying our branding or marking a project as "official" in a way that would confuse the average viewer into believing a project is official when it isn't.
 
-6: When possible, give credit to each texture individually, particularly if your project mixes multiple packs. (You can use our gallery at https://webapp.faithfulpack.net/#/gallery/, or the "credits.txt" file present in every Classic Faithful pack to help you find specific authors.) However, if your project is mostly our assets you can just give credit to all of them in one entry. 
-
-7: This file, unmodified, must be included in all forms of content that use any assets of us.
-
-
-You must abide by the above rules if you are doing any of the following:
-
-
-1: Distributing our assets in any form, modified or not.
-
-2: Using our textures as placeholders.
-
-3: Using our textures as a base for any of your own textures that you're making public.
-
-4: Using a few textures that you cannot properly make yourself (e.g. paintings).
-
-5: Distributing a modified copy as a content creator with your videos/streams.
-
-6: Using textures for adventure maps, server resource packs, mod textures, or data packs.
+6: This file, unmodified, must be included in any content which contains any of our work.
 
 
 Exceptions:
 
 
-1: If you're doing anything privately and undistributed to our assets (e.g. custom edit for personal use, unpublished add-ons, mod support, using the pack for a small private Minecraft server, or edits either by you or from different packs) you can safely disregard all of these requirements since you are not gaining unfairly from us in any form.
+1: If you're doing anything privately or undistributed to our work (e.g. custom edit for personal use, unpublished add-ons, mod support, personal Minecraft server resource pack, or edits either by you or from different packs) you can safely disregard all of these requirements since you are not gaining unfairly from us in any form.
 
+2: Projects not directly related to textures (e.g. website, bot) may have separate licenses with different terms. Check their respective pages or repositories for more information. If nothing is mentioned, assume that all rights remain reserved.
 
-For Classic Faithful only:
+3: If you are using textures made before March 2016 (Minecraft Release 1.9). These textures are licensed under Vattic's original Faithful 32x32 license, which has different requirements compared with this license. If you're interested, you can find the original license here under "Usage Guidelines":
+	https://web.archive.org/web/20150607220656/http://www.minecraftforum.net:80/forums/mapping-and-modding/resource-packs/1223254-faithful-32x32-pack-update-red-cat-clay-1-8
 
 
-1: If your pack can be considered an add-on (a secondary pack meant to be run on top of the main pack), do not claim it as an official one anywhere. Instead, submit it to us, so we can add it to the official add-on database. You can do that in Classic Faithful's server: https://discord.gg/KSEhCVtg4J (You can still post it anywhere you want – just don't brand it as an official Classic Faithful add-on without submitting it to us.)
-
-2: If you are using textures made prior to March 2016 (Minecraft Release 1.9), they are licensed under Vattic's original Faithful 32x32 license, which is different to this license. You can find the original license here, under "Usage Guidelines", if you are interested:
-    https://web.archive.org/web/20150607220656/http://www.minecraftforum.net:80/forums/mapping-and-modding/resource-packs/1223254-faithful-32x32-pack-update-red-cat-clay-1-8
-
 
 We reserve the right to:
 
 
-1: Refuse the ability to use, distribute, or modify any assets from us. This action would be final, generally only in the case of unusual circumstances.
+1: Refuse the ability to use, distribute, or modify any work made by us for any person or group. This action would be final, generally only in the case of unusual circumstances.
 
 2: Take legal action if you do not comply with these guidelines.
 

assets/forge/textures/block/milk_flowing.png.mcmeta

@@ -0,0 +1,5 @@
+{
+  "animation": {
+    "frametime": 2
+  }
+}

assets/forge/textures/block/milk_still.png.mcmeta

@@ -0,0 +1,5 @@
+{
+  "animation": {
+    "frametime": 3
+  }
+}