Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
152 commits
Select commit Hold shift + click to select a range
c03af36
Updated to 1.18, only 1 main issue left to figure out :D
SpottyTheTurtle Dec 21, 2021
7432784
part-fix of the fishing rod stuff, still throwing a bunch of weird er…
SpottyTheTurtle Dec 23, 2021
b7d9653
(Hopefully) pushed the working changes to 1.18
SpottyTheTurtle Dec 30, 2021
54c8191
Added block mineability tags
FortressNebula Dec 30, 2021
27b26f0
overwrite existing broken stuff with Grimm's working branch.
SpottyTheTurtle Dec 30, 2021
fc1cca9
Fixed dependencies on create and flywheel
FortressNebula Dec 31, 2021
6fedb43
Update build.gradle
FortressNebula Dec 31, 2021
507f677
Convert ModBlocks to registrate
FortressNebula Dec 31, 2021
79849dc
Convert ModItems to registrate
FortressNebula Dec 31, 2021
44b8d3d
now you see the waxed bronze block, now you dont
FortressNebula Dec 31, 2021
3d4a62c
fixed mod item tier
FortressNebula Dec 31, 2021
0da1620
Add bronze block oxidization stages
FortressNebula Dec 31, 2021
6f25999
Added all bronze block oxidization stages
FortressNebula Dec 31, 2021
d712ce9
so much renaming, so many json files
FortressNebula Dec 31, 2021
92a9544
incredibly important commit (trust me)
FortressNebula Dec 31, 2021
a78bbfd
Revamped how tags are initialized
FortressNebula Dec 31, 2021
0e7ef37
Update oxidized_bronze_block.png
FortressNebula Dec 31, 2021
aa7607f
Little fixes
FortressNebula Dec 31, 2021
d190378
Reverted mod tag changes
FortressNebula Dec 31, 2021
2097610
Fixed mod blocks
FortressNebula Jan 1, 2022
717ec10
Update ModBlocks.java
FortressNebula Jan 1, 2022
f9c2399
Add waxed blocks
FortressNebula Jan 1, 2022
98e0e7c
Added more stuff for waxed bronze
FortressNebula Jan 1, 2022
cb5f9e6
Removed steampowered recipe overrides
FortressNebula Jan 1, 2022
3f6f2d7
Polished descriptions and names
FortressNebula Jan 1, 2022
4755218
Update mods.toml
FortressNebula Jan 1, 2022
6ef4501
Add shears tag
FortressNebula Jan 3, 2022
4d06657
Added loot tables for everything affected by shears
FortressNebula Jan 3, 2022
17b3f87
Update Alloyed.java
FortressNebula Jan 4, 2022
c43552c
Working on steel fishing rod fix
FortressNebula Jan 4, 2022
848c7f5
Make shouldStopFishing a public function
FortressNebula Jan 4, 2022
081a546
Update SteelFishingHook.java
FortressNebula Jan 4, 2022
6c0765f
Bit of renaming
FortressNebula Jan 4, 2022
cab7b2b
Fix jar version
FortressNebula Jan 7, 2022
8b8dfdf
Delete ModFluids.java
FortressNebula Jan 8, 2022
8a95c64
Added waxed bronze item models
FortressNebula Jan 8, 2022
f7a9011
Create lightning bolt mixin for bronze
FortressNebula Jan 8, 2022
a9a860d
Update Alloyed.java
FortressNebula Jan 8, 2022
6c2f499
Fixed weird function bodies
FortressNebula Jan 8, 2022
ee91a79
Ported server bug patch
FortressNebula Jan 12, 2022
80469d9
Update build.gradle
FortressNebula Jan 12, 2022
21b06e8
Proxy class for client registration
FortressNebula Jan 13, 2022
e5d408a
Update ModSounds.java
FortressNebula Jan 13, 2022
f74efe9
converting to registrate
FortressNebula Jan 13, 2022
4bbcf5c
Fix issue in asset utils
FortressNebula Jan 13, 2022
4ed6763
more registrate stuff
FortressNebula Jan 13, 2022
9f0d598
Added mineability tags
FortressNebula Jan 13, 2022
5fef43e
final bits of datagen
FortressNebula Jan 13, 2022
48b0690
Use local capture on lightning bolt mixin
FortressNebula Jan 14, 2022
50bd1cc
Updated Textures
MythrilBagels Jan 23, 2022
d12e68c
Updated Textures
MythrilBagels Jan 23, 2022
0117386
gradle edits
FortressNebula Feb 1, 2022
c01ab9d
rearranged packages
FortressNebula Feb 1, 2022
c0faac7
Update steel_fishing_rod.json
FortressNebula Feb 1, 2022
23cf05c
fix parchment mappings
FortressNebula Feb 1, 2022
3d7d55a
some general fixes
FortressNebula Feb 2, 2022
083fc3a
Update mods.toml
FortressNebula Feb 2, 2022
c595131
temp fix for gradle
FortressNebula Feb 2, 2022
68ea15b
Update build.gradle
FortressNebula Feb 4, 2022
9446478
Client Handler now uses @SubscribeEvent
FortressNebula Feb 4, 2022
5f99bf1
Update ModTags.java
FortressNebula Feb 4, 2022
f7fbc6c
Update DataUtils.java
FortressNebula Feb 4, 2022
4f1bb7e
correct bronze lang
FortressNebula Feb 4, 2022
10ad6df
bronze tags
FortressNebula Feb 4, 2022
b6117c0
move textures
FortressNebula Feb 4, 2022
e1f68a0
datagen
FortressNebula Feb 4, 2022
d76ddbb
Fixed steel fishing rod
FortressNebula Feb 5, 2022
6b950a9
fixed recipes
FortressNebula Feb 5, 2022
8f59da0
Create bronze_bell.json
FortressNebula Feb 5, 2022
c53256f
add steel knife
FortressNebula Feb 5, 2022
8c82bfb
datagen
FortressNebula Feb 5, 2022
4bdf50c
parameters line up!
FortressNebula Feb 5, 2022
3b43418
ponders are here! (including datagen)
FortressNebula Feb 5, 2022
8b78941
v0.1 Release Commit
FortressNebula Feb 5, 2022
1799ae3
Update steel_ingot.json
FortressNebula Feb 5, 2022
39129e2
Update bronze_bell.json
FortressNebula Feb 5, 2022
4223e42
Delete steel_knife.json
FortressNebula Feb 5, 2022
5ff61ba
Create steel_knife.json
FortressNebula Feb 5, 2022
ca1cd87
update forge version
FortressNebula Feb 7, 2022
a253a2f
bunch of changes
FortressNebula Feb 7, 2022
9b42163
more package refactoring
FortressNebula Feb 7, 2022
38f678b
Fix #9
FortressNebula Feb 7, 2022
269666b
Create steel_knife.json
FortressNebula Feb 7, 2022
cb64b42
Updated Metal Textures
MythrilBagels Feb 7, 2022
039bb4f
v0.1a Release Commit
FortressNebula Feb 8, 2022
bd34dc7
Merge branch '1.18' of https://github.com/MythrilBagels/Create-Alloye…
FortressNebula Feb 8, 2022
1e62fb8
Fix #17
FortressNebula Feb 10, 2022
8639ab0
Big data refactoring
FortressNebula Feb 10, 2022
93aa681
some changes to the event handlers
FortressNebula Feb 10, 2022
feaa050
Beginning with recipe automation
FortressNebula Feb 10, 2022
214060c
datagen
FortressNebula Feb 10, 2022
2268b4b
Registrate Recipes
FortressNebula Feb 11, 2022
577d651
bunch of changes
FortressNebula Feb 12, 2022
4ba6a52
Fixed some log stuff
FortressNebula Feb 12, 2022
2dbc1c0
Remove unnecessary functions in RecipeUtils
FortressNebula Feb 12, 2022
a22f650
v0.1b Release Commit
FortressNebula Feb 12, 2022
57cac0e
cursegradle
FortressNebula Feb 13, 2022
defec91
Finished setting up cursegradle
FortressNebula Feb 13, 2022
e88c44a
Finally got cursegradle working properly
FortressNebula Feb 13, 2022
6ff17b6
v1.2 Release
FortressNebula Feb 14, 2022
249784b
Automating loot modifiers
FortressNebula Feb 14, 2022
22f9410
more loot modifier automation
FortressNebula Feb 15, 2022
6cd298a
Leftover loot modifier stuff
FortressNebula Mar 29, 2022
7762294
Begun porting 1.16 to 1.18
FortressNebula Mar 29, 2022
5cc8e77
datagen
FortressNebula Mar 29, 2022
57fd17b
Update README.md
FortressNebula Mar 29, 2022
5061929
more porting
FortressNebula Apr 3, 2022
9ce67f7
resource porting
FortressNebula Apr 4, 2022
9b218c3
datagen + updating dependencies
FortressNebula Apr 4, 2022
328db24
steel bars
FortressNebula Apr 4, 2022
3df36b9
v1.3 Release Commit
FortressNebula Apr 4, 2022
a8a0471
fixed buggy recipes
FortressNebula Apr 14, 2022
07cb338
1.18.2 port
FortressNebula Apr 18, 2022
85bb466
v1.3c changes
FortressNebula May 7, 2022
43228b1
Update README.md
FortressNebula May 7, 2022
1314a6f
small changes
FortressNebula May 10, 2022
7faabdb
fixed some issues
FortressNebula May 11, 2022
2646a2b
even more fixes
FortressNebula May 12, 2022
416395a
Update ModArmourMaterials.java
FortressNebula May 12, 2022
a1dde38
Fix CF showing new files as supporting 1.18.1
FortressNebula May 15, 2022
0692dd0
some changes
FortressNebula Jul 9, 2022
84ce800
Merge branch '1.18' of https://github.com/MythrilBagels/Create-Alloye…
FortressNebula Jul 9, 2022
4d4571c
finished porting to 0.5
FortressNebula Jul 9, 2022
d231edd
added steel ladders
FortressNebula Jul 9, 2022
2f98f56
fixed some bugs
FortressNebula Jul 12, 2022
3c000a1
port to 0.5b
FortressNebula Jul 12, 2022
20436b4
Updated some item textures
MythrilBagels Jul 12, 2022
dcfc2c2
Updated Steel Shovel texture
MythrilBagels Jul 13, 2022
dfff506
Added simplified chinese translation from Yizhouuu
FortressNebula Jul 27, 2022
cfc1896
fix
Jul 27, 2022
13a2256
Merge pull request #41 from Kasualix/1.18
FortressNebula Jul 28, 2022
dbe5e99
v1.4c
FortressNebula Aug 18, 2022
982a8d4
0.5.0e update
FortressNebula Oct 30, 2022
785e202
bronze bell rework
FortressNebula Nov 5, 2022
9c6be4d
Add files via upload
Omokage-R Nov 13, 2022
67819bd
final modifications
FortressNebula Nov 21, 2022
3933a31
Merge pull request #56 from Omokage-R/1.18
FortressNebula Nov 21, 2022
c96e185
Revert "Merge pull request #56 from Omokage-R/1.18"
FortressNebula Nov 21, 2022
94ed5a3
Revert "Revert "Merge pull request #56 from Omokage-R/1.18""
FortressNebula Nov 21, 2022
8bf7f35
Updated Textures
MythrilBagels Dec 11, 2022
b39ddc9
nuggets + updating registrate stuff
FortressNebula Dec 18, 2022
6df646e
updated dependencies and ponder
FortressNebula Dec 19, 2022
818bfe2
tiny bugfix
FortressNebula Dec 19, 2022
c6a4a0a
v1.4e release
FortressNebula Dec 19, 2022
469701a
update dependencies and steel mesh fence code
FortressNebula May 22, 2023
3449a1a
fixed #71
FortressNebula May 22, 2023
b21240d
added steel catwalk stairs
FortressNebula May 24, 2023
21e5cfb
fixed #76
FortressNebula May 28, 2023
98d0cd2
steel casing + steel encased stuff
FortressNebula May 31, 2023
0e6fd89
steel scaffolding
FortressNebula May 31, 2023
b89bc39
misc changes
FortressNebula Jun 1, 2023
9deba8c
encased steel belts
FortressNebula Jun 9, 2023
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
  •  
  •  
  •  
4 changes: 2 additions & 2 deletions .github/workflows/gradle.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ name: Java CI with Gradle

on:
push:
branches: [ master ]
branches: [ master, 1.16, 1.18 ]
pull_request:
branches: [ master ]
branches: [ master, 1.16, 1.18 ]

jobs:
build:
Expand Down
132 changes: 19 additions & 113 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,119 +1,25 @@
# User-specific stuff
.idea/

*.iml
# eclipse
bin
*.launch
.settings
.metadata
.classpath
.project

# idea
out
*.ipr
*.iws
*.iml
.idea

# IntelliJ
out/
# mpeltonen/sbt-idea plugin
.idea_modules/

# JIRA plugin
atlassian-ide-plugin.xml

# Compiled class file
*.class

# Log file
*.log

# BlueJ files
*.ctxt

# Package Files #
*.jar
*.war
*.nar
*.ear
*.zip
*.tar.gz
*.rar

# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
hs_err_pid*

*~

# temporary files which can be created if a process still has a handle open of a deleted file
.fuse_hidden*

# KDE directory preferences
.directory

# Linux trash folder which might appear on any partition or disk
.Trash-*

# .nfs files are created when an open file is removed but is still being accessed
.nfs*

# General
.DS_Store
.AppleDouble
.LSOverride

# Icon must end with two \r
Icon

# Thumbnails
._*

# Files that might appear in the root of a volume
.DocumentRevisions-V100
.fseventsd
.Spotlight-V100
.TemporaryItems
.Trashes
.VolumeIcon.icns
.com.apple.timemachine.donotpresent

# Directories potentially created on remote AFP share
.AppleDB
.AppleDesktop
Network Trash Folder
Temporary Items
.apdisk

# Windows thumbnail cache files
Thumbs.db
Thumbs.db:encryptable
ehthumbs.db
ehthumbs_vista.db

# Dump file
*.stackdump

# Folder config file
[Dd]esktop.ini

# Recycle Bin used on file shares
$RECYCLE.BIN/

# Windows Installer files
*.cab
*.msi
*.msix
*.msm
*.msp

# Windows shortcuts
*.lnk

# gradle
build
.gradle
build/

# Ignore Gradle GUI config
gradle-app.setting

# Cache of project
.gradletasknamecache

**/build/

# Common working directory
run/
# other
eclipse
run

# Avoid ignoring Gradle wrapper jar file (.jar files are usually ignored)
!gradle-wrapper.jar
/run/
# Files from Forge MDK
forge*changelog.txt
Binary file modified .gradle/7.1.1/fileHashes/fileHashes.lock
Binary file not shown.
Binary file modified .gradle/buildOutputCleanup/buildOutputCleanup.lock
Binary file not shown.
4 changes: 2 additions & 2 deletions .gradle/buildOutputCleanup/cache.properties
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
#Tue Oct 26 21:04:26 BST 2021
gradle.version=7.1.1
#Thu Dec 30 13:09:00 GMT 2021
gradle.version=7.3.3
Binary file modified .gradle/buildOutputCleanup/outputFiles.bin
Binary file not shown.
Binary file modified .gradle/checksums/checksums.lock
Binary file not shown.
4 changes: 2 additions & 2 deletions .idea/compiler.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 0 additions & 4 deletions .idea/gradle.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

22 changes: 11 additions & 11 deletions .idea/jarRepositories.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .idea/misc.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

18 changes: 5 additions & 13 deletions .idea/runConfigurations/runClient.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

17 changes: 5 additions & 12 deletions .idea/runConfigurations/runData.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

15 changes: 5 additions & 10 deletions .idea/runConfigurations/runServer.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 3 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
# Create-Alloyed
Create: Alloyed is an addon for the Create mod that adds *two new metals, Bronze and Steel*, along with a selection of blocks and items made of these materials.
Create: Alloyed is an addon for the Create mod that adds *two new metals, Bronze and Steel*, along with a selection of blocks and items made of these materials. This branch is for the 1.18.2 version.

**Team:**<br />
**Bagels** - Artist, Owner<br />
**SpottyTheTurtle** - Coder, something else maybe? idk not yet<br />
**FortressNebula** - Coder, also maybe smth else

*We might add more, such as Tin or Cast Iron, but these are only concepts, not 100% confirmed*
**SpottyTheTurtle** - Coder<br />
**FortressNebula** - Coder
Loading