Skip to content

Commit

Permalink
Merge branch 'dev' into finishWithTents
Browse files Browse the repository at this point in the history
  • Loading branch information
@Kevin-771
Kevin-771 authored Nov 3, 2023
2 parents 4c4e776 + 91366b0 commit 20d74eb
Show file tree
Hide file tree
Showing 115 changed files with 4,722 additions and 1,069 deletions.
4 changes: 2 additions & 2 deletions bin/main/edu/rpi/legup/legup/config
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<puzzle name="Fillapix"
qualifiedClassName="edu.rpi.legup.puzzle.fillapix.Fillapix"
fileType=".xml"
fileCreationDisabled="true"/>
fileCreationDisabled="false"/>
<puzzle name="HeyAwake"
qualifiedClassName="edu.rpi.legup.puzzle.heyawake.Heyawake"
fileType=".xml"
Expand Down Expand Up @@ -40,4 +40,4 @@
fileType=".xml"
fileCreationDisabled="true"/>
</puzzles>
</Legup>
</Legup>
1 change: 0 additions & 1 deletion build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ dependencies {
implementation 'org.jetbrains:annotations:20.1.0'
implementation 'org.jetbrains:annotations:20.1.0'
implementation 'com.formdev:flatlaf:3.0'
implementation project(':legup-update')
implementation 'com.google.firebase:firebase-admin:6.3.0'
implementation 'org.apache.httpcomponents:httpclient:4.5.1'
implementation group: 'org.slf4j', name: 'slf4j-api', version: '1.7.25'
Expand Down
11 changes: 0 additions & 11 deletions build/resources/test/puzzles/lightup/rules/BulbsInPathContradictionRule/BlockInVerticalPath
View file

This file was deleted.

Empty file removed build/resources/test/puzzles/lightup/rules/BulbsInPathContradictionRule/CannotFillMiddle
View file
Empty file.
10 changes: 0 additions & 10 deletions ...d/resources/test/puzzles/lightup/rules/BulbsInPathContradictionRule/LightInHorizontalPath
View file

This file was deleted.

10 changes: 0 additions & 10 deletions build/resources/test/puzzles/lightup/rules/BulbsInPathContradictionRule/LightInVerticalPath
View file

This file was deleted.

13 changes: 0 additions & 13 deletions .../resources/test/puzzles/lightup/rules/CannotLightACellContradictionRule/CannotFillCorners
View file

This file was deleted.

11 changes: 0 additions & 11 deletions ...d/resources/test/puzzles/lightup/rules/CannotLightACellContradictionRule/CannotFillMiddle
View file

This file was deleted.

13 changes: 0 additions & 13 deletions build/resources/test/puzzles/lightup/rules/TooFewBulbsContradictionRule/BlockEnclosed
View file

This file was deleted.

15 changes: 0 additions & 15 deletions ...ources/test/puzzles/lightup/rules/TooFewBulbsContradictionRule/CompleteBoardBlockEnclosed
View file

This file was deleted.

11 changes: 0 additions & 11 deletions build/resources/test/puzzles/lightup/rules/TooFewBulbsContradictionRule/CornerBlockEnclosed
View file

This file was deleted.

17 changes: 0 additions & 17 deletions build/resources/test/puzzles/lightup/rules/TooFewBulbsContradictionRule/ManyBlocksEnclosed
View file

This file was deleted.

13 changes: 0 additions & 13 deletions build/resources/test/puzzles/lightup/rules/TooManyBulbsContradictionRule/BlockEnclosed
View file

This file was deleted.

15 changes: 0 additions & 15 deletions ...urces/test/puzzles/lightup/rules/TooManyBulbsContradictionRule/CompleteBoardBlockEnclosed
View file

This file was deleted.

11 changes: 0 additions & 11 deletions build/resources/test/puzzles/lightup/rules/TooManyBulbsContradictionRule/CornerBlockEnclosed
View file

This file was deleted.

17 changes: 0 additions & 17 deletions build/resources/test/puzzles/lightup/rules/TooManyBulbsContradictionRule/ManyBlocksEnclosed
View file

This file was deleted.

48 changes: 48 additions & 0 deletions puzzles files/fillapix/10x10 Fillapix Advanced/FillapixAdvanced10x10_1
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<Legup version="2.0.0">
<puzzle name="Fillapix">
<board width="10" height="10">
<cells>
<cell value="3" x="2" y="0"/>
<cell value="3" x="3" y="0"/>
<cell value="3" x="0" y="1"/>
<cell value="0" x="6" y="1"/>
<cell value="0" x="8" y="1"/>
<cell value="3" x="2" y="2"/>
<cell value="4" x="3" y="2"/>
<cell value="3" x="5" y="2"/>
<cell value="3" x="0" y="3"/>
<cell value="4" x="2" y="3"/>
<cell value="3" x="7" y="3"/>
<cell value="2" x="0" y="4"/>
<cell value="3" x="1" y="4"/>
<cell value="5" x="3" y="4"/>
<cell value="4" x="5" y="4"/>
<cell value="4" x="6" y="4"/>
<cell value="4" x="9" y="4"/>
<cell value="5" x="2" y="5"/>
<cell value="4" x="3" y="5"/>
<cell value="6" x="4" y="5"/>
<cell value="6" x="5" y="5"/>
<cell value="4" x="7" y="5"/>
<cell value="4" x="9" y="5"/>
<cell value="3" x="5" y="6"/>
<cell value="3" x="6" y="6"/>
<cell value="4" x="9" y="6"/>
<cell value="3" x="1" y="7"/>
<cell value="5" x="4" y="7"/>
<cell value="6" x="5" y="7"/>
<cell value="5" x="6" y="7"/>
<cell value="4" x="9" y="7"/>
<cell value="7" x="3" y="8"/>
<cell value="7" x="7" y="8"/>
<cell value="5" x="9" y="8"/>
<cell value="4" x="1" y="9"/>
<cell value="6" x="4" y="9"/>
<cell value="6" x="6" y="9"/>
<cell value="5" x="8" y="9"/>
</cells>
</board>
</puzzle>
<Solved isSolved="false"/>
</Legup>
0 ...apix/10x10 Fillapix Very Easy/03010000074 → ...10x10 Fillapix Basic/FillapixBasic10x10_1
View file
File renamed without changes.
91 changes: 91 additions & 0 deletions puzzles files/fillapix/15x15 Fillapix Advanced/FillapixAdvanced15x15_1
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,91 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<Legup version="3.0.0">
<puzzle name="Fillapix">
<board height="15" width="15">
<cells>
<cell value="4" x="3" y="0"/>
<cell value="4" x="6" y="0"/>
<cell value="6" x="8" y="0"/>
<cell value="5" x="10" y="0"/>
<cell value="4" x="11" y="0"/>
<cell value="1" x="14" y="0"/>
<cell value="4" x="1" y="1"/>
<cell value="7" x="9" y="1"/>
<cell value="4" x="2" y="2"/>
<cell value="0" x="5" y="2"/>
<cell value="1" x="6" y="2"/>
<cell value="4" x="8" y="2"/>
<cell value="5" x="10" y="2"/>
<cell value="6" x="12" y="2"/>
<cell value="4" x="0" y="3"/>
<cell value="0" x="3" y="3"/>
<cell value="0" x="5" y="3"/>
<cell value="3" x="7" y="3"/>
<cell value="4" x="10" y="3"/>
<cell value="5" x="12" y="3"/>
<cell value="4" x="14" y="3"/>
<cell value="1" x="2" y="4"/>
<cell value="2" x="5" y="4"/>
<cell value="3" x="7" y="4"/>
<cell value="5" x="8" y="4"/>
<cell value="4" x="9" y="4"/>
<cell value="4" x="11" y="4"/>
<cell value="5" x="12" y="4"/>
<cell value="2" x="1" y="5"/>
<cell value="3" x="4" y="5"/>
<cell value="5" x="6" y="5"/>
<cell value="5" x="9" y="5"/>
<cell value="5" x="10" y="5"/>
<cell value="5" x="11" y="5"/>
<cell value="1" x="2" y="6"/>
<cell value="2" x="3" y="6"/>
<cell value="5" x="5" y="6"/>
<cell value="3" x="7" y="6"/>
<cell value="4" x="8" y="6"/>
<cell value="5" x="14" y="6"/>
<cell value="0" x="1" y="7"/>
<cell value="0" x="2" y="7"/>
<cell value="1" x="3" y="7"/>
<cell value="5" x="6" y="7"/>
<cell value="6" x="8" y="7"/>
<cell value="7" x="10" y="7"/>
<cell value="6" x="12" y="7"/>
<cell value="4" x="14" y="7"/>
<cell value="5" x="8" y="8"/>
<cell value="5" x="9" y="8"/>
<cell value="6" x="12" y="8"/>
<cell value="0" x="1" y="9"/>
<cell value="4" x="4" y="9"/>
<cell value="6" x="6" y="9"/>
<cell value="6" x="10" y="9"/>
<cell value="7" x="12" y="9"/>
<cell value="8" x="5" y="10"/>
<cell value="8" x="7" y="10"/>
<cell value="7" x="8" y="10"/>
<cell value="7" x="12" y="10"/>
<cell value="3" x="14" y="10"/>
<cell value="5" x="2" y="11"/>
<cell value="7" x="4" y="11"/>
<cell value="8" x="6" y="11"/>
<cell value="7" x="8" y="11"/>
<cell value="7" x="9" y="11"/>
<cell value="5" x="12" y="11"/>
<cell value="2" x="1" y="12"/>
<cell value="8" x="3" y="12"/>
<cell value="8" x="5" y="12"/>
<cell value="6" x="9" y="12"/>
<cell value="5" x="10" y="12"/>
<cell value="5" x="14" y="12"/>
<cell value="1" x="1" y="13"/>
<cell value="5" x="3" y="13"/>
<cell value="5" x="5" y="13"/>
<cell value="3" x="7" y="13"/>
<cell value="5" x="10" y="13"/>
<cell value="3" x="12" y="13"/>
<cell value="4" x="14" y="13"/>
<cell value="2" x="11" y="14"/>
<cell value="3" x="12" y="14"/>
</cells>
</board>
</puzzle>
</Legup>
Loading

0 comments on commit 20d74eb

Please sign in to comment.