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

Remerge updated binary puzzle, proof editor, puzzle editor, home panel, bug fixes #859

Merged
merged 11 commits into from
Oct 15, 2024
Merged

Remerge updated binary puzzle, proof editor, puzzle editor, home panel, bug fixes #859

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
87d7ac1
Test Commit to see how reverting works
jadeandtea Sep 26, 2024
c04eef1
Revert "Test Commit to see how reverting works"
jadeandtea Sep 26, 2024
476486d
Test commit to see how reverting a merge works
jadeandtea Sep 26, 2024
7aa29db
Merge branch 'dev' of https://github.com/Bram-Hub/LEGUP into dev
jadeandtea Sep 26, 2024
1044f1c
Revert "Test commit to see how reverting a merge works"
jadeandtea Sep 27, 2024
1cc1c45
Merge pull request #858 from zacharybonagura/master
jadeandtea Sep 27, 2024
e0d3b3a
Automated Java code formatting changes
Bram28 Sep 27, 2024
d3965f5
Merge pull request #860 from Bram-Hub/auto-format-code-1727468924
jadeandtea Sep 27, 2024
53f29b0
Remove extraneous check of package name
jadeandtea Oct 6, 2024
19a37c6
Fixing merge issue
jadeandtea Oct 8, 2024
13a38b3
Fixing Merge Conflict
jadeandtea Oct 11, 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
  •  
  •  
  •  
19 changes: 19 additions & 0 deletions output_path/test/src/resources/puzzles/sudoku/rules/LastCellForNumberDirectRule/TestBoard
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<Legup version="2.0.0">
<puzzle name="Sudoku">
<board size="9">
<cells>
<cell value="1" x="0" y="0"/>
<cell value="2" x="1" y="0"/>
<cell value="3" x="2" y="0"/>
<cell value="4" x="0" y="1"/>
<cell value="5" x="1" y="1"/>
<cell value="6" x="2" y="1"/>
<cell value="7" x="0" y="2"/>
<cell value="8" x="1" y="2"/>

</cells>
</board>
</puzzle>
<solved isSolved="false" lastSaved="--"/>
</Legup>
19 changes: 19 additions & 0 deletions output_path/test/src/resources/puzzles/sudoku/rules/LastNumberForCellDirectRule/FullRegion
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<Legup version="2.0.0">
<puzzle name="Sudoku">
<board size="9">
<cells>
<cell value="1" x="0" y="3"/>
<cell value="2" x="1" y="3"/>
<cell value="3" x="2" y="3"/>
<cell value="4" x="0" y="4"/>
<cell value="5" x="1" y="4"/>
<cell value="6" x="2" y="4"/>
<cell value="7" x="0" y="5"/>
<cell value="8" x="1" y="5"/>

</cells>
</board>
</puzzle>
<solved isSolved="false" lastSaved="--"/>
</Legup>
Empty file added output_path/test/src/resources/puzzles/sudoku/rules/RepeatedNumberContradictionRule/a
View file
Open in desktop
Empty file.
111 changes: 111 additions & 0 deletions puzzles files/binary/10x10 Binary Hard/10x10 Binary Hard 1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,111 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<Legup version="3.0.0">
<saved/>
<puzzle name="Binary">
<board height="10" width="10">
<cells>
<cell value="2" x="0" y="0"/>
<cell value="2" x="1" y="0"/>
<cell value="0" x="2" y="0"/>
<cell value="2" x="3" y="0"/>
<cell value="2" x="4" y="0"/>
<cell value="2" x="5" y="0"/>
<cell value="2" x="6" y="0"/>
<cell value="2" x="7" y="0"/>
<cell value="2" x="8" y="0"/>
<cell value="2" x="9" y="0"/>
<cell value="0" x="0" y="1"/>
<cell value="2" x="1" y="1"/>
<cell value="0" x="2" y="1"/>
<cell value="2" x="3" y="1"/>
<cell value="2" x="4" y="1"/>
<cell value="1" x="5" y="1"/>
<cell value="2" x="6" y="1"/>
<cell value="2" x="7" y="1"/>
<cell value="2" x="8" y="1"/>
<cell value="2" x="9" y="1"/>
<cell value="2" x="0" y="2"/>
<cell value="2" x="1" y="2"/>
<cell value="2" x="2" y="2"/>
<cell value="2" x="3" y="2"/>
<cell value="2" x="4" y="2"/>
<cell value="2" x="5" y="2"/>
<cell value="2" x="6" y="2"/>
<cell value="2" x="7" y="2"/>
<cell value="1" x="8" y="2"/>
<cell value="2" x="9" y="2"/>
<cell value="2" x="0" y="3"/>
<cell value="2" x="1" y="3"/>
<cell value="2" x="2" y="3"/>
<cell value="2" x="3" y="3"/>
<cell value="2" x="4" y="3"/>
<cell value="2" x="5" y="3"/>
<cell value="0" x="6" y="3"/>
<cell value="2" x="7" y="3"/>
<cell value="2" x="8" y="3"/>
<cell value="0" x="9" y="3"/>
<cell value="1" x="0" y="4"/>
<cell value="2" x="1" y="4"/>
<cell value="0" x="2" y="4"/>
<cell value="0" x="3" y="4"/>
<cell value="2" x="4" y="4"/>
<cell value="1" x="5" y="4"/>
<cell value="2" x="6" y="4"/>
<cell value="2" x="7" y="4"/>
<cell value="2" x="8" y="4"/>
<cell value="2" x="9" y="4"/>
<cell value="2" x="0" y="5"/>
<cell value="2" x="1" y="5"/>
<cell value="2" x="2" y="5"/>
<cell value="2" x="3" y="5"/>
<cell value="2" x="4" y="5"/>
<cell value="2" x="5" y="5"/>
<cell value="2" x="6" y="5"/>
<cell value="2" x="7" y="5"/>
<cell value="2" x="8" y="5"/>
<cell value="2" x="9" y="5"/>
<cell value="2" x="0" y="6"/>
<cell value="2" x="1" y="6"/>
<cell value="0" x="2" y="6"/>
<cell value="2" x="3" y="6"/>
<cell value="2" x="4" y="6"/>
<cell value="1" x="5" y="6"/>
<cell value="2" x="6" y="6"/>
<cell value="1" x="7" y="6"/>
<cell value="2" x="8" y="6"/>
<cell value="2" x="9" y="6"/>
<cell value="1" x="0" y="7"/>
<cell value="2" x="1" y="7"/>
<cell value="2" x="2" y="7"/>
<cell value="2" x="3" y="7"/>
<cell value="2" x="4" y="7"/>
<cell value="2" x="5" y="7"/>
<cell value="2" x="6" y="7"/>
<cell value="2" x="7" y="7"/>
<cell value="1" x="8" y="7"/>
<cell value="1" x="9" y="7"/>
<cell value="2" x="0" y="8"/>
<cell value="2" x="1" y="8"/>
<cell value="2" x="2" y="8"/>
<cell value="0" x="3" y="8"/>
<cell value="2" x="4" y="8"/>
<cell value="2" x="5" y="8"/>
<cell value="2" x="6" y="8"/>
<cell value="2" x="7" y="8"/>
<cell value="2" x="8" y="8"/>
<cell value="2" x="9" y="8"/>
<cell value="1" x="0" y="9"/>
<cell value="2" x="1" y="9"/>
<cell value="2" x="2" y="9"/>
<cell value="2" x="3" y="9"/>
<cell value="1" x="4" y="9"/>
<cell value="2" x="5" y="9"/>
<cell value="1" x="6" y="9"/>
<cell value="2" x="7" y="9"/>
<cell value="1" x="8" y="9"/>
<cell value="2" x="9" y="9"/>
</cells>
</board>
</puzzle>
<solved isSolved="false" lastSaved="2024-07-19 00:12:25"/>
</Legup>
111 changes: 111 additions & 0 deletions puzzles files/binary/10x10 Binary Hard/10x10 Binary Hard 2
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,111 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<Legup version="3.0.0">
<saved/>
<puzzle name="Binary">
<board height="10" width="10">
<cells>
<cell value="2" x="0" y="0"/>
<cell value="2" x="1" y="0"/>
<cell value="2" x="2" y="0"/>
<cell value="0" x="3" y="0"/>
<cell value="2" x="4" y="0"/>
<cell value="2" x="5" y="0"/>
<cell value="1" x="6" y="0"/>
<cell value="2" x="7" y="0"/>
<cell value="2" x="8" y="0"/>
<cell value="0" x="9" y="0"/>
<cell value="2" x="0" y="1"/>
<cell value="2" x="1" y="1"/>
<cell value="1" x="2" y="1"/>
<cell value="2" x="3" y="1"/>
<cell value="1" x="4" y="1"/>
<cell value="2" x="5" y="1"/>
<cell value="2" x="6" y="1"/>
<cell value="2" x="7" y="1"/>
<cell value="0" x="8" y="1"/>
<cell value="2" x="9" y="1"/>
<cell value="2" x="0" y="2"/>
<cell value="0" x="1" y="2"/>
<cell value="2" x="2" y="2"/>
<cell value="2" x="3" y="2"/>
<cell value="2" x="4" y="2"/>
<cell value="2" x="5" y="2"/>
<cell value="2" x="6" y="2"/>
<cell value="1" x="7" y="2"/>
<cell value="0" x="8" y="2"/>
<cell value="2" x="9" y="2"/>
<cell value="2" x="0" y="3"/>
<cell value="0" x="1" y="3"/>
<cell value="2" x="2" y="3"/>
<cell value="2" x="3" y="3"/>
<cell value="2" x="4" y="3"/>
<cell value="2" x="5" y="3"/>
<cell value="2" x="6" y="3"/>
<cell value="2" x="7" y="3"/>
<cell value="2" x="8" y="3"/>
<cell value="2" x="9" y="3"/>
<cell value="2" x="0" y="4"/>
<cell value="2" x="1" y="4"/>
<cell value="2" x="2" y="4"/>
<cell value="2" x="3" y="4"/>
<cell value="0" x="4" y="4"/>
<cell value="2" x="5" y="4"/>
<cell value="2" x="6" y="4"/>
<cell value="2" x="7" y="4"/>
<cell value="2" x="8" y="4"/>
<cell value="2" x="9" y="4"/>
<cell value="2" x="0" y="5"/>
<cell value="2" x="1" y="5"/>
<cell value="1" x="2" y="5"/>
<cell value="2" x="3" y="5"/>
<cell value="2" x="4" y="5"/>
<cell value="2" x="5" y="5"/>
<cell value="2" x="6" y="5"/>
<cell value="2" x="7" y="5"/>
<cell value="2" x="8" y="5"/>
<cell value="0" x="9" y="5"/>
<cell value="2" x="0" y="6"/>
<cell value="2" x="1" y="6"/>
<cell value="2" x="2" y="6"/>
<cell value="1" x="3" y="6"/>
<cell value="2" x="4" y="6"/>
<cell value="2" x="5" y="6"/>
<cell value="0" x="6" y="6"/>
<cell value="2" x="7" y="6"/>
<cell value="2" x="8" y="6"/>
<cell value="2" x="9" y="6"/>
<cell value="2" x="0" y="7"/>
<cell value="0" x="1" y="7"/>
<cell value="2" x="2" y="7"/>
<cell value="2" x="3" y="7"/>
<cell value="2" x="4" y="7"/>
<cell value="2" x="5" y="7"/>
<cell value="2" x="6" y="7"/>
<cell value="2" x="7" y="7"/>
<cell value="0" x="8" y="7"/>
<cell value="2" x="9" y="7"/>
<cell value="2" x="0" y="8"/>
<cell value="0" x="1" y="8"/>
<cell value="0" x="2" y="8"/>
<cell value="2" x="3" y="8"/>
<cell value="2" x="4" y="8"/>
<cell value="2" x="5" y="8"/>
<cell value="2" x="6" y="8"/>
<cell value="0" x="7" y="8"/>
<cell value="2" x="8" y="8"/>
<cell value="0" x="9" y="8"/>
<cell value="2" x="0" y="9"/>
<cell value="2" x="1" y="9"/>
<cell value="2" x="2" y="9"/>
<cell value="0" x="3" y="9"/>
<cell value="2" x="4" y="9"/>
<cell value="2" x="5" y="9"/>
<cell value="1" x="6" y="9"/>
<cell value="2" x="7" y="9"/>
<cell value="0" x="8" y="9"/>
<cell value="2" x="9" y="9"/>
</cells>
</board>
</puzzle>
<solved isSolved="false" lastSaved="2024-07-26 14:44:39"/>
</Legup>
111 changes: 111 additions & 0 deletions puzzles files/binary/10x10 Binary Hard/10x10 Binary Hard 3
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,111 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<Legup version="3.0.0">
<saved/>
<puzzle name="Binary">
<board height="10" width="10">
<cells>
<cell value="2" x="0" y="0"/>
<cell value="2" x="1" y="0"/>
<cell value="2" x="2" y="0"/>
<cell value="2" x="3" y="0"/>
<cell value="1" x="4" y="0"/>
<cell value="2" x="5" y="0"/>
<cell value="0" x="6" y="0"/>
<cell value="2" x="7" y="0"/>
<cell value="1" x="8" y="0"/>
<cell value="2" x="9" y="0"/>
<cell value="2" x="0" y="1"/>
<cell value="1" x="1" y="1"/>
<cell value="1" x="2" y="1"/>
<cell value="2" x="3" y="1"/>
<cell value="2" x="4" y="1"/>
<cell value="2" x="5" y="1"/>
<cell value="2" x="6" y="1"/>
<cell value="2" x="7" y="1"/>
<cell value="2" x="8" y="1"/>
<cell value="2" x="9" y="1"/>
<cell value="1" x="0" y="2"/>
<cell value="2" x="1" y="2"/>
<cell value="2" x="2" y="2"/>
<cell value="2" x="3" y="2"/>
<cell value="2" x="4" y="2"/>
<cell value="2" x="5" y="2"/>
<cell value="2" x="6" y="2"/>
<cell value="2" x="7" y="2"/>
<cell value="1" x="8" y="2"/>
<cell value="2" x="9" y="2"/>
<cell value="2" x="0" y="3"/>
<cell value="0" x="1" y="3"/>
<cell value="2" x="2" y="3"/>
<cell value="1" x="3" y="3"/>
<cell value="2" x="4" y="3"/>
<cell value="2" x="5" y="3"/>
<cell value="0" x="6" y="3"/>
<cell value="2" x="7" y="3"/>
<cell value="2" x="8" y="3"/>
<cell value="2" x="9" y="3"/>
<cell value="2" x="0" y="4"/>
<cell value="0" x="1" y="4"/>
<cell value="2" x="2" y="4"/>
<cell value="1" x="3" y="4"/>
<cell value="2" x="4" y="4"/>
<cell value="2" x="5" y="4"/>
<cell value="2" x="6" y="4"/>
<cell value="1" x="7" y="4"/>
<cell value="2" x="8" y="4"/>
<cell value="2" x="9" y="4"/>
<cell value="2" x="0" y="5"/>
<cell value="2" x="1" y="5"/>
<cell value="2" x="2" y="5"/>
<cell value="2" x="3" y="5"/>
<cell value="0" x="4" y="5"/>
<cell value="2" x="5" y="5"/>
<cell value="1" x="6" y="5"/>
<cell value="2" x="7" y="5"/>
<cell value="1" x="8" y="5"/>
<cell value="2" x="9" y="5"/>
<cell value="2" x="0" y="6"/>
<cell value="2" x="1" y="6"/>
<cell value="0" x="2" y="6"/>
<cell value="2" x="3" y="6"/>
<cell value="0" x="4" y="6"/>
<cell value="2" x="5" y="6"/>
<cell value="2" x="6" y="6"/>
<cell value="2" x="7" y="6"/>
<cell value="2" x="8" y="6"/>
<cell value="0" x="9" y="6"/>
<cell value="2" x="0" y="7"/>
<cell value="1" x="1" y="7"/>
<cell value="2" x="2" y="7"/>
<cell value="2" x="3" y="7"/>
<cell value="2" x="4" y="7"/>
<cell value="2" x="5" y="7"/>
<cell value="2" x="6" y="7"/>
<cell value="1" x="7" y="7"/>
<cell value="2" x="8" y="7"/>
<cell value="2" x="9" y="7"/>
<cell value="2" x="0" y="8"/>
<cell value="2" x="1" y="8"/>
<cell value="2" x="2" y="8"/>
<cell value="2" x="3" y="8"/>
<cell value="2" x="4" y="8"/>
<cell value="2" x="5" y="8"/>
<cell value="2" x="6" y="8"/>
<cell value="2" x="7" y="8"/>
<cell value="2" x="8" y="8"/>
<cell value="2" x="9" y="8"/>
<cell value="0" x="0" y="9"/>
<cell value="2" x="1" y="9"/>
<cell value="0" x="2" y="9"/>
<cell value="0" x="3" y="9"/>
<cell value="2" x="4" y="9"/>
<cell value="2" x="5" y="9"/>
<cell value="2" x="6" y="9"/>
<cell value="2" x="7" y="9"/>
<cell value="2" x="8" y="9"/>
<cell value="0" x="9" y="9"/>
</cells>
</board>
</puzzle>
<solved isSolved="false" lastSaved="2024-07-26 14:45:38"/>
</Legup>
Loading
Loading