Compare commits

..

24 Commits

Author SHA1 Message Date
Evorp
d3e25411c0 remove unused script 2025-12-17 14:28:37 -08:00
Evorp
fc4ef68665 take 3 2025-12-17 14:08:10 -08:00
Evorp
62ca45c4e1 take 2 2025-12-17 14:04:10 -08:00
Evorp
d2d8eefc8d maybe fix triggering 2025-12-17 14:02:34 -08:00
Francesco Macaluso
f40a6eb541 Overhaul autozip using rsync (#59) 2025-12-17 13:56:28 -08:00
Evorp
99f2156883 Update README.md 2025-01-01 17:22:53 -08:00
Evorp
68d4021d54 Update README.md 2024-12-18 15:23:37 -08:00
Evorp
3bbbf62712 Revert "test branches-ignore"
This reverts commit 5091000e58.
2024-06-23 14:37:55 -07:00
Evorp
5091000e58 test branches-ignore 2024-06-23 14:35:23 -07:00
Robert
3916c1f4d5 Revert "test action for branch fetching"
This reverts commit 5956eebacc.
2024-06-23 12:53:56 +02:00
Robert
fcb9042d21 Revert "the"
This reverts commit b2dfc93d21.
2024-06-23 12:53:52 +02:00
Robert
b2dfc93d21 the 2024-06-23 12:45:16 +02:00
Robert
5956eebacc test action for branch fetching 2024-06-23 12:44:00 +02:00
Robert
4a7d9b5523 Revert "improve create pack action"
This reverts commit 6785fe05fa.
2024-06-23 11:57:14 +02:00
Robert
6785fe05fa improve create pack action
- automatically downloiads branch to server when it doesn't exist
- use more variables instead of hardcoded values
- simplified some things
- should run on all branches (hopefully not at once)
2024-06-23 11:41:26 +02:00
Robert
b5ca564df0 remove funding 2023-06-10 19:07:44 +02:00
Evorp
f81b19e847 remove compliance reference 2023-03-19 14:16:09 -07:00
Evorp
0a1374c9ac classic faithful and faithful readme parity
about time too lol
2023-03-19 14:03:12 -07:00
Pomi108
4b05ba6039 Update LICENSE.txt 2023-02-20 18:13:39 +01:00
Pomi108
3a2e8c3333 Update README.md 2023-01-26 18:55:31 +01:00
Pomi108
33caba3279 add license 2022-09-27 21:22:59 +02:00
Evorp
8f4c3cb117 typo 2022-09-26 19:53:53 -07:00
Robert
dbfc4f807e Update README.md 2022-09-26 22:09:11 +02:00
Robert
e7fe377616 Delete create-pack.yml 2022-07-24 22:23:18 +02:00
5 changed files with 101 additions and 40 deletions

2
.github/FUNDING.yml vendored
View File

@@ -1,2 +0,0 @@
# These are supported funding model platforms
patreon: Faithful_Resource_Pack

View File

@@ -1,30 +0,0 @@
name: Create Pack
on:
push:
branches-ignore:
- master
- main
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
- name: Create Pack
uses: appleboy/ssh-action@master
with:
host: ${{ secrets.HOST }}
USERNAME: ${{ secrets.USERNAME }}
PORT: ${{ secrets.PORT }}
KEY: ${{ secrets.SSH }}
script: |
cd "./packs/Faithful-Java-32x"
git pull
git checkout ${{ steps.branch-name.outputs.current_branch }}
zip -r Faithful-Java-32x-${{ steps.branch-name.outputs.current_branch }}-Experimental.zip . -x "*.git*" -x "*.github*" -x ".gitignore"
[ ! -d "/var/www/html/database.faithfulpack.net/packs/32x-Java/${{ steps.branch-name.outputs.current_branch }}" ] && mkdir "/var/www/html/database.faithfulpack.net/packs/32x-Java/${{ steps.branch-name.outputs.current_branch }}"
mv Faithful-Java-32x-${{ steps.branch-name.outputs.current_branch }}-Experimental.zip "/var/www/html/database.faithfulpack.net/packs/32x-Java/${{ steps.branch-name.outputs.current_branch }}"

30
.gitignore vendored
View File

@@ -1 +1,31 @@
.DS_Store
.AppleDouble
.LSOverride
._*
.DocumentRevisions-V100
.fseventsd
.Spotlight-V100
.TemporaryItems
.Trashes
.VolumeIcon.icns
.com.apple.timemachine.donotpresent
.AppleDB
.AppleDesktop
Network Trash Folder
Temporary Items
.apdisk
Thumbs.db
Thumbs.db:encryptable
ehthumbs.db
ehthumbs_vista.db
*.stackdump
[Dd]esktop.ini
*~
.fuse_hidden*
.directory
.Trash-*
.nfs*
# For testing out the autozip workflow
.act-secrets.local
.act-vars.local

57
LICENSE.txt Normal file
View File

@@ -0,0 +1,57 @@
FAITHFUL LICENSE
Version 3 - 20th February 2023
Copyright © Faithful Resource Pack
You may do the following:
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).
2: Link back to our website, which you can find here:
https://faithfulpack.net/
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 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 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: This file, unmodified, must be included in any content which contains any of our work.
Exceptions:
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.
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
We reserve the right to:
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.
3: Change this license at any time for any reason.

View File

@@ -1,16 +1,22 @@
<img src="https://github.com/Faithful-Resource-Pack/Branding/blob/main/logos/transparent/512/f32_logo.png?raw=true" alt="Faithful 32x" align="right" height="256px">
<img src="https://database.faithfulpack.net/images/branding/logos/transparent/hd/f32_logo.png?w=256" alt="Faithful 32x" align="right" height="256px">
<div align="center">
<h1>Faithful 32x</h1>
<h3>The original Minecraft texture feel, with double the resolution and double the fun!</h3>
<h3>The go-to 32x resource pack for Minecraft.</h3>
<h5><i>Official Java Edition repository</i></h5>
![RepoSize](https://img.shields.io/github/repo-size/Compliance-Resource-Pack/Resource-Pack-32x)
![Issues](https://img.shields.io/github/issues/Compliance-Resource-Pack/Resource-Pack-32x)
![PullRequests](https://img.shields.io/github/issues-pr/Compliance-Resource-Pack/Resource-Pack-32x)
![RepoSize](https://img.shields.io/github/repo-size/Faithful-Resource-Pack/Faithful-32x-Java)
![Issues](https://img.shields.io/github/issues/Faithful-Resource-Pack/Faithful-32x-Java)
![PullRequests](https://img.shields.io/github/issues-pr/Faithful-Resource-Pack/Faithful-32x-Java)
</div>
---
### Important:
#### To view the pack files and to switch between resource pack versions, click the branch button (usually named `master` or `main`) and select the version you want to see!
![Branch Button](https://i.imgur.com/meBP6N8.png)
## How to download:
The latest release versions can be downloaded on [our website](https://faithfulpack.net/faithful32x/latest) and the latest unreleased versions on [our database](https://database.faithfulpack.net/packs/32x-Java/Experimental/).
## How to switch versions:
To view the pack files and to switch between resource pack versions, click the branch button (`main`) and select the version you want to see!
The latest stable version is stored in `java-latest`, and snapshot and prerelease versions (if available) in `java-snapshot`.
<img src="https://user-images.githubusercontent.com/75297863/163904169-6ab97237-946c-4cf2-be60-3909a464d308.png" align="center" height="512px">