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.

Sign up for GitHub

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

Visual PIDS Editor #1

Draft
wants to merge 30 commits into
base: main
Choose a base branch
from
+989 −93
Draft

Visual PIDS Editor #1

Changes from 1 commit
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
890f143
Incomplete Visual PIDS Integration
dooji2 Mar 29, 2024
22b5d03
Incomplete Visual PIDS Implementation
dooji2 Mar 29, 2024
48db783
Fix PIDS Preset Screen
dooji2 Mar 29, 2024
74cc10e
Cleanup
Kenny-Hui Mar 29, 2024
1dcceed
Fix resourcePackFolder being initialized after initializeCategories()…
dooji2 Mar 29, 2024
80d3140
Cleanup & Make text scale
Kenny-Hui Mar 31, 2024
003aad8
Fix gitignore
dooji2 Apr 12, 2024
1c91530
Added clock & frame to preview. Spotlights are now toggleable
dooji2 Apr 14, 2024
43d8e9e
Merge remote-tracking branch 'upstream/main' into visual-pids-editor
dooji2 Apr 14, 2024
88708df
Empty line
dooji2 Apr 14, 2024
24acda3
Fix build
Kenny-Hui Apr 14, 2024
3bad333
Make text translatable
dooji2 Apr 14, 2024
e593b0d
Add spotlight functionality to light lantern block
dooji2 Apr 14, 2024
824b3ab
Merge remote-tracking branch 'upstream/main' into visual-pids-editor
dooji2 Apr 14, 2024
fe438ec
Update it_it.json
Kenny-Hui Apr 18, 2024
2de90d1
Merge remote-tracking branch 'upstream/main' into visual-pids-editor
dooji2 Apr 25, 2024
fbe44cb
Try downgrade manifold
Kenny-Hui Apr 26, 2024
df5148b
Make reloadResources() public
dooji2 Apr 26, 2024
dcb38f7
Revert manifold downgrade
dooji2 Apr 26, 2024
4ec22f3
Added new save screens
dooji2 Apr 27, 2024
eb24aa1
Merge branch 'main' of https://github.com/DistrictOfJoban/Joban-Clien…
Kenny-Hui Apr 27, 2024
0cb8eb7
Merge remote-tracking branch 'upstream/main' into visual-pids-editor
dooji2 Apr 27, 2024
48e24dc
Cleanup
Kenny-Hui Apr 27, 2024
a160eec
Merge branch 'visual-pids-editor' of https://github.com/dooji2/Joban-…
Kenny-Hui Apr 27, 2024
317a188
Merge remote-tracking branch 'upstream/main' into visual-pids-editor
dooji2 Apr 28, 2024
9d3f40d
Added resource pack export functionality
dooji2 Apr 29, 2024
5221892
Merge remote-tracking branch 'upstream/main' into visual-pids-editor
dooji2 Apr 29, 2024
9b2e841
Merge remote-tracking branch 'upstream/main' into visual-pids-editor
dooji2 Apr 30, 2024
2ad1515
Merge remote-tracking branch 'upstream/main' into visual-pids-editor
dooji2 May 18, 2024
33ab380
Merge remote-tracking branch 'upstream/main' into visual-pids-editor
dooji2 May 22, 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
Prev Previous commit
Next Next commit
Loading
Loading status checks…
Merge remote-tracking branch 'upstream/main' into visual-pids-editor
  • Loading branch information
@dooji2
dooji2 committed Apr 29, 2024
commit 52218921f02e3fad5c8af80fd1f319aa23e4bd01

This merge commit was added into this branch cleanly.

There are no new changes to show, but you can still view the diff.