Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

1.21.1 NeoForged #26

Merged
merged 148 commits into from
Sep 4, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
148 commits
Select commit Hold shift + click to select a range
86b3102
1.16 Bringup
Jun 27, 2020
3c7bda4
1.4.1 Release
Jul 9, 2020
19ffa79
Release: 1.4.2
Jul 15, 2020
cb431e7
add simple chinese
a5161655 Jul 21, 2020
ff9b72f
Merge pull request #13 from a5161655/1.16
Jul 21, 2020
64bd2a6
Release: 1.5.0:
Jul 23, 2020
9dd0e61
Release: 1.5.1:
Jul 28, 2020
f2552b5
1.5.2 Update:
Sep 4, 2020
aba7bbe
1.16.3
Oct 2, 2020
4612281
1.16.3
Oct 2, 2020
af97398
1.16.3
Oct 2, 2020
230654a
1.16.3
Oct 2, 2020
63c7189
1.16.3
Oct 2, 2020
db41b25
Create ko_kr.json
mindy15963 Nov 1, 2020
a80e28e
Merge pull request #14 from mindy15963/patch-1
Nov 1, 2020
cc961bc
Update ru_ru.json
BardinTheDwarf Nov 12, 2020
bc5be63
Merge pull request #15 from BardinTheDwarf/patch-1
Nov 12, 2020
fb47489
Release: 1.6.0:
Dec 12, 2020
e7915de
Update README.md
Dec 22, 2020
4ae707c
Update README.md
Dec 22, 2020
14897ce
Update README.md
Dec 23, 2020
0f1ad63
Update licensing
Dec 23, 2020
9490746
Add create:fan_transparent tags
mdujovic17 Feb 8, 2021
ddaf351
Testing: 3D models (BETA)
mdujovic17 Feb 10, 2021
b9a0bbf
3D models base
mdujovic17 Feb 11, 2021
b7f0a7a
MESS: Electric boogaloo
mdujovic17 Feb 13, 2021
fe73839
Reimplement crossed bars, round some parent variables
mdujovic17 Feb 20, 2021
f012545
new model for horizontal bars
mdujovic17 Feb 24, 2021
7761473
Stackable horizontal bars
mdujovic17 Mar 6, 2021
9b7a029
bop blocks and items as addon
mdujovic17 Mar 14, 2021
b3cdb28
horizontal bars 3d parents (WIP)
mdujovic17 Mar 18, 2021
873d6ec
alter registry code so there are no repetitions (DRY)
mdujovic17 Mar 18, 2021
19006c6
Reverse some changes, switch multi-project method
mdujovic17 Mar 19, 2021
8671800
bump
mdujovic17 Mar 19, 2021
678c695
bump
mdujovic17 Mar 19, 2021
9aa4b31
bump
mdujovic17 Mar 19, 2021
7c8152d
bump
mdujovic17 Mar 19, 2021
e086f4b
bump
mdujovic17 Mar 19, 2021
cf9fba9
Update commit&push
mdujovic17 Mar 19, 2021
cafd295
Remove a feature and pray that it doesn't break
mdujovic17 Mar 19, 2021
d93f64b
Reimplement gold and iron bars, remove test data
mdujovic17 Mar 20, 2021
298b14a
Update data
mdujovic17 Mar 20, 2021
0311f5c
Update special models
mdujovic17 Mar 21, 2021
a17eacc
Fix crossed bars models, remove unused textures
mdujovic17 Mar 21, 2021
cdc36f0
Add item model, update block models
mdujovic17 Mar 24, 2021
76890ed
Final update to models, fixed texture orientation
mdujovic17 Mar 24, 2021
6cb2f1c
Remove mahogany recipe
mdujovic17 Mar 25, 2021
d7c4a65
Fix models, fix oak bars texture
mdujovic17 Mar 25, 2021
63b94b9
Fix sound effect for nether blocks
mdujovic17 Mar 26, 2021
6527b1b
Fix sound effect for nether blocks
mdujovic17 Mar 26, 2021
2d13ec3
Change methods from protected to private
mdujovic17 Mar 28, 2021
e0908f8
Bump version
mdujovic17 Mar 28, 2021
0bd6d5d
Switch from helper class BlockBarsBase.java directly to PaneBlock.
mdujovic17 Mar 28, 2021
0b2aa04
Update en_us.json
mdujovic17 Apr 26, 2021
6b23e3e
es_es.json update (16n1c0)
mdujovic17 Apr 26, 2021
dbcd7e0
recipe groups
mdujovic17 Apr 26, 2021
44ab9b4
recipe groups
mdujovic17 Apr 26, 2021
7c31546
conversion_recipes
mdujovic17 Apr 27, 2021
a93ca3a
conversion recipes groups
mdujovic17 Apr 27, 2021
57c2219
conversion recipes groups
mdujovic17 Apr 27, 2021
b30d149
Merge remote-tracking branch 'origin/1.16' into 1.16
mdujovic17 Apr 27, 2021
2c79183
conversion recipes groups
mdujovic17 Apr 27, 2021
3194381
bump to 2.0.3
mdujovic17 Apr 27, 2021
f54ef6a
bump
mdujovic17 May 27, 2021
2765614
Bump to 1.17 and official mappings
mdujovic17 Jul 28, 2021
c27009e
Update to 1.17.1
mdujovic17 Jul 29, 2021
5516681
Implement localized Oxidization features, register copper blocks.
mdujovic17 Aug 13, 2021
bc286d9
Implement copper bars fully, remove
mdujovic17 Aug 15, 2021
213a554
remove classic bars models
mdujovic17 Aug 15, 2021
1ffb3ca
Update to the latest forge version
mdujovic17 Aug 15, 2021
0f1d659
Use tags for tool types
mdujovic17 Aug 15, 2021
2afc7ef
Prep for 3.0
mdujovic17 Aug 15, 2021
67668c5
Fix oxidization progress
mdujovic17 Aug 15, 2021
2be645c
Add supplementaries to BlockConditions,
mdujovic17 Aug 15, 2021
2399f5e
API Boilerplate
mdujovic17 Aug 19, 2021
eb56b49
Update ko_kr.json
mindy15963 Nov 21, 2021
dc891d1
Merge pull request #20 from mindy15963/patch-2
mdujovic17 Nov 22, 2021
9e35e3c
Update to 1.18
mdujovic17 Dec 2, 2021
8cec42f
Refactoring and 1.18 work
mdujovic17 Dec 2, 2021
2129335
update mods.toml
mdujovic17 Dec 3, 2021
0358763
Bump to 1.18.1
mdujovic17 Dec 23, 2021
94906f8
Refactor
mdujovic17 Dec 23, 2021
ed6d95a
Update ru_ru.josn
Externallex Jan 29, 2022
6211961
Merge pull request #21 from Bytegm/1.18
mdujovic17 Jan 31, 2022
b7d7c1f
Update forge and gradle version
mdujovic17 Feb 24, 2022
a02c29b
Language template
mdujovic17 Mar 4, 2022
a0fc415
Update to 1.18.2
mdujovic17 Mar 4, 2022
42995aa
Update translation text (v3)
mdujovic17 Mar 4, 2022
9b9f5d8
Text hover component
mdujovic17 Mar 4, 2022
05b25d1
3.0.0b
mdujovic17 Mar 4, 2022
b2cbf23
Create uk_ua.json
BetaCarotina Apr 22, 2022
222823f
Semantic Versioning 2.0.0
mdujovic17 Apr 24, 2022
c641187
Reduce gradle RAM availability from 4G to 1G
mdujovic17 Apr 24, 2022
ba184fc
Forge 40.1.0
mdujovic17 Apr 24, 2022
1543112
Gradle 7.4.2
mdujovic17 Apr 24, 2022
c99ccb1
Remove FUNDING.yml
mdujovic17 Apr 24, 2022
80a8bad
GitHub Workflow Actions (build)
mdujovic17 Apr 24, 2022
20cdcee
Improper field usage :pensive:
BetaCarotina Apr 24, 2022
ad5be5a
Merge pull request #22 from BetaCarotina/patch-1
mdujovic17 Apr 25, 2022
b516f7e
Bump Forge requirement to 40
mdujovic17 Apr 25, 2022
987b440
3.0.1
mdujovic17 Apr 25, 2022
b058dc7
Update Bars text descriptions
mdujovic17 Jul 5, 2022
bb11f8b
Remove render layers as they are not used
mdujovic17 Jul 5, 2022
35131db
Add Recipe advancements
mdujovic17 Jul 5, 2022
5b709ab
Update loot tables
mdujovic17 Jul 5, 2022
ba97282
Add mangrove bars loot tables
mdujovic17 Jul 5, 2022
1400fb0
Add copper bars loot tables
mdujovic17 Jul 5, 2022
a7f6539
Add mangrove bars recipes
mdujovic17 Jul 5, 2022
5d6f7e8
Update gold bars recipe
mdujovic17 Jul 5, 2022
fdcc3a0
Remove EventHandler
mdujovic17 Jul 5, 2022
147038e
Update tags
mdujovic17 Jul 5, 2022
c399a06
Presence Footsteps support
mdujovic17 Jul 5, 2022
8e44f24
Pack version 9
mdujovic17 Jul 5, 2022
4f434e6
MC 1.19
mdujovic17 Jul 5, 2022
05639e1
Update mappings
mdujovic17 Jul 5, 2022
14ba8bb
Replace BlockTypeEnum with BlockType
mdujovic17 Jul 5, 2022
e0ad7f7
Update models, include mangrove bars and
mdujovic17 Jul 5, 2022
49acc33
Mangrove bars blockstates
mdujovic17 Jul 5, 2022
48825e5
Remove gold conditional recipe
mdujovic17 Jul 5, 2022
99febf2
1.19
mdujovic17 Jul 5, 2022
86392a1
Update translations to template version 4
mdujovic17 Jul 5, 2022
7bef390
Add mangrove bars registries
mdujovic17 Jul 5, 2022
cee03e1
Update to 1.19.2
mdujovic17 Oct 9, 2022
fdc94a5
Preliminary Copper bars support
mdujovic17 Oct 9, 2022
006d218
Major version 4
mdujovic17 Oct 9, 2022
4ed4170
Delete TODO
mdujovic17 Sep 4, 2024
1bdccf7
Delete changelog.txt
mdujovic17 Sep 4, 2024
c930a75
Add CHANGELOG.md
mdujovic17 Sep 4, 2024
44662d8
Add .gitattributes
mdujovic17 Sep 4, 2024
e5d879e
Update Gradle Wrapper
mdujovic17 Sep 4, 2024
560b58b
Update GitHub Build Action
mdujovic17 Sep 4, 2024
4c042d5
Delete Logs
mdujovic17 Sep 4, 2024
70e3ed4
Update .gitignore
mdujovic17 Sep 4, 2024
faa9c7c
Remove Vanilla Bars model override
mdujovic17 Sep 4, 2024
635c75c
Switch to NeoForge MDK
mdujovic17 Sep 4, 2024
54efc34
Drop Mod Support for now
mdujovic17 Sep 4, 2024
9cab811
Remove redundant classes
mdujovic17 Sep 4, 2024
33317c1
Remove block mod support for now
mdujovic17 Sep 4, 2024
5d69b0e
Remove Creative Groups classes
mdujovic17 Sep 4, 2024
ec1c213
Refactoring registries
mdujovic17 Sep 4, 2024
df2403f
Update lang references
mdujovic17 Sep 4, 2024
c5550a5
Update Models to use Vanilla variants, remove 3D Variants
mdujovic17 Sep 4, 2024
4f2b12d
Update to NeoForge 1.21.1
mdujovic17 Sep 4, 2024
cf5807c
Revert RenderType
mdujovic17 Sep 4, 2024
c23e40a
Bump Version and Mod Description
mdujovic17 Sep 4, 2024
8e2ee0f
Registry Issues
mdujovic17 Sep 4, 2024
15dce9f
Bars oxidation
mdujovic17 Sep 4, 2024
ff54a40
GitHub Publish Release Action
mdujovic17 Sep 4, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
5 changes: 5 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
# Disable autocrlf on generated files, they always generate with LF
# Add any extra files or paths here to make git stop saying they
# are changed when only line endings change.
src/generated/**/.cache/cache text eol=lf
src/generated/**/*.json text eol=lf
12 changes: 0 additions & 12 deletions .github/FUNDING.yml

This file was deleted.

24 changes: 24 additions & 0 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
name: Build

on: [push, pull_request]

jobs:
build:
runs-on: ubuntu-latest
steps:
- name: Checkout repository
uses: actions/checkout@v4
with:
fetch-depth: 0
fetch-tags: true

- name: Setup JDK 21
uses: actions/setup-java@v4
with:
java-version: '21'
distribution: 'temurin'

- name: Build with Gradle
uses: gradle/actions/setup-gradle@v3
with:
arguments: build
52 changes: 52 additions & 0 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
name: Publish on GitHub Releases, CurseForge and Modrinth
on: [pull_request, workflow_dispatch]

env:
MINECRAFT_VERSION: 1.21.1
JAVA_VERSION: 21
VERSION: 5.0.0+1.21.1
RELEASE_NAME: Additional Bars 5.0.0
GITHUB_TOKEN: ${{ secrets.PUBLISH_GITHUB_TOKEN }}

permissions:
contents: write

jobs:
build:
runs-on: ubuntu-latest
steps:
- name: Check Environment Variables
run: env

- name: Check-out Repo
uses: actions/checkout@v3
with:
submodules: true

- name: Setup Java
uses: actions/setup-java@v2
with:
distribution: "temurin"
java-version: ${{env.JAVA_VERSION}}

- name: Make Gradle Wrapper Executable
if: ${{ runner.os != 'Windows' }}
run: chmod +x ./gradlew

- name: Build
run: ./gradlew clean build

- name: Publish to GitHub
uses: Kir-Antipov/mc-publish@v3.3
with:
github-tag: "v${{env.VERSION}}"
github-token: "${{env.GITHUB_TOKEN}}"

name: "${{env.RELEASE_NAME}}"
version: "${{env.VERSION}}"
version-type: release
changelog-file: CHANGELOG.md

loaders: neoforge
game-versions: "${{env.MINECRAFT_VERSION}}"
java: "${{env.JAVA_VERSION}}"
4 changes: 4 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -23,3 +23,7 @@ run

# Files from Forge MDK
forge*changelog.txt
logs
.vscode
/logs/
./logs
Empty file added CHANGELOG.md
Empty file.
Loading
Loading