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

asteroid dimension #320

Draft
wants to merge 28 commits into
base: main
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
a6604e4
first commit
maxryan008 May 22, 2024
b7cfc2d
Added Asteroids Dimension
maxryan008 May 23, 2024
b2b9c89
Merge remote-tracking branch 'upstream/main' into 1.20.4-block-textur…
maxryan008 May 28, 2024
c25e0c6
Asteroid Dimension Terrain Generation
maxryan008 May 28, 2024
25ec673
Fixed File not exists when loading Asteroid Dimension
maxryan008 May 29, 2024
b2cc1c3
Reworked canned food items
maxryan008 Jun 2, 2024
ffc8942
Merge remote-tracking branch 'upstream/main' into 1.20.4-block-textur…
maxryan008 Jun 2, 2024
a980842
Merge remote-tracking branch 'upstream/main' into 1.20.4-block-textur…
maxryan008 Jun 11, 2024
7010fda
canned food items
maxryan008 Jun 26, 2024
af5ca3b
canned food complete
maxryan008 Jun 26, 2024
55ad014
Fully finished food canner
maxryan008 Jul 10, 2024
ac3acde
started rudimentary work on structures
maxryan008 Jul 14, 2024
1db30d3
fixed licenscing + more
maxryan008 Aug 19, 2024
76b6233
no summary???
maxryan008 Aug 21, 2024
0115cd9
working more on sealers
maxryan008 Aug 27, 2024
b116b82
Fixed data generation and ran data generation
maxryan008 Aug 29, 2024
580ffb6
minor tweaks
maxryan008 Aug 29, 2024
e4c20f3
Translation fixes
maxryan008 Aug 29, 2024
838e1cb
Made launch pads dynamic
maxryan008 Aug 30, 2024
8087c7e
Rocket Nose Cone Part added
maxryan008 Aug 31, 2024
697ed02
made machines autogenerated
maxryan008 Sep 2, 2024
a643484
Revert "made machines autogenerated"
maxryan008 Sep 2, 2024
d198e83
Revert "Rocket Nose Cone Part added"
maxryan008 Sep 2, 2024
90f54b5
Revert "Made launch pads dynamic"
maxryan008 Sep 2, 2024
2611ae7
Reverted all rocket changes but left machine changes
maxryan008 Sep 2, 2024
8d8cd83
Merge remote-tracking branch 'upstream/main' into 1.20.4-block-textur…
maxryan008 Sep 2, 2024
8e8a2e2
Merged into main 1.21 branch
maxryan008 Sep 3, 2024
fb40b39
Merge remote-tracking branch 'upstream/main' into 1.20.4-block-textur…
maxryan008 Dec 4, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 20 additions & 20 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
# Windows files (CRLF)
*.bat text eol=crlf

# Text
*.properties text

# Java
*.java text diff=java
*.gradle text diff=java
*.gradle.kts text diff=kotlin

# Binary
*.class binary
*.dll binary
*.ear binary
*.jar binary
*.so binary
*.war binary

**/.cache/* linguist-generated=true
# Windows files (CRLF)
*.bat text eol=crlf
# Text
*.properties text
# Java
*.java text diff=java
*.gradle text diff=java
*.gradle.kts text diff=kotlin
# Binary
*.class binary
*.dll binary
*.ear binary
*.jar binary
*.so binary
*.war binary
**/.cache/* linguist-generated=true
Loading