-
Notifications
You must be signed in to change notification settings - Fork 82
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #699 from Bram-Hub/dev
LEGUP December 2023 Dev->Master merge
- Loading branch information
Showing
319 changed files
with
10,477 additions
and
841 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,15 +1,15 @@ | ||
| # Logging level | ||
| # Root logger option | ||
| log4j.rootLogger=DEBUG, stdout, file | ||
| # Redirect log messages to console | ||
| log4j.appender.stdout=org.apache.log4j.ConsoleAppender | ||
| log4j.appender.stdout.Target=System.out | ||
| log4j.appender.stdout.layout=org.apache.log4j.PatternLayout | ||
| log4j.appender.stdout.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss} %-5p %c{1}:%L - %m%n | ||
| # Redirect log messages to a log file, support file rolling. | ||
| log4j.appender.file=org.apache.log4j.RollingFileAppender | ||
| log4j.appender.file.File=Legup.log | ||
| log4j.appender.file.MaxFileSize=5MB | ||
| log4j.appender.file.MaxBackupIndex=10 | ||
| log4j.appender.file.layout=org.apache.log4j.PatternLayout | ||
| # Logging level | ||
| # Root logger option | ||
| log4j.rootLogger=DEBUG, stdout, file | ||
| # Redirect log messages to console | ||
| log4j.appender.stdout=org.apache.log4j.ConsoleAppender | ||
| log4j.appender.stdout.Target=System.out | ||
| log4j.appender.stdout.layout=org.apache.log4j.PatternLayout | ||
| log4j.appender.stdout.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss} %-5p %c{1}:%L - %m%n | ||
| # Redirect log messages to a log file, support file rolling. | ||
| log4j.appender.file=org.apache.log4j.RollingFileAppender | ||
| log4j.appender.file.File=Legup.log | ||
| log4j.appender.file.MaxFileSize=5MB | ||
| log4j.appender.file.MaxBackupIndex=10 | ||
| log4j.appender.file.layout=org.apache.log4j.PatternLayout | ||
| log4j.appender.file.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss} %-5p %c{1}:%L - %m%n |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Empty file.
10 changes: 0 additions & 10 deletions
10
build/resources/test/puzzles/lightup/rules/BulbsInPathContradictionRule/LightInVerticalPath
This file was deleted.
Oops, something went wrong.
13 changes: 0 additions & 13 deletions
13
.../resources/test/puzzles/lightup/rules/CannotLightACellContradictionRule/CannotFillCorners
This file was deleted.
Oops, something went wrong.
11 changes: 0 additions & 11 deletions
11
...d/resources/test/puzzles/lightup/rules/CannotLightACellContradictionRule/CannotFillMiddle
This file was deleted.
Oops, something went wrong.
13 changes: 0 additions & 13 deletions
13
build/resources/test/puzzles/lightup/rules/TooFewBulbsContradictionRule/BlockEnclosed
This file was deleted.
Oops, something went wrong.
15 changes: 0 additions & 15 deletions
15
...ources/test/puzzles/lightup/rules/TooFewBulbsContradictionRule/CompleteBoardBlockEnclosed
This file was deleted.
Oops, something went wrong.
11 changes: 0 additions & 11 deletions
11
build/resources/test/puzzles/lightup/rules/TooFewBulbsContradictionRule/CornerBlockEnclosed
This file was deleted.
Oops, something went wrong.
17 changes: 0 additions & 17 deletions
17
build/resources/test/puzzles/lightup/rules/TooFewBulbsContradictionRule/ManyBlocksEnclosed
This file was deleted.
Oops, something went wrong.
13 changes: 0 additions & 13 deletions
13
build/resources/test/puzzles/lightup/rules/TooManyBulbsContradictionRule/BlockEnclosed
This file was deleted.
Oops, something went wrong.
15 changes: 0 additions & 15 deletions
15
...urces/test/puzzles/lightup/rules/TooManyBulbsContradictionRule/CompleteBoardBlockEnclosed
This file was deleted.
Oops, something went wrong.
11 changes: 0 additions & 11 deletions
11
build/resources/test/puzzles/lightup/rules/TooManyBulbsContradictionRule/CornerBlockEnclosed
This file was deleted.
Oops, something went wrong.
17 changes: 0 additions & 17 deletions
17
build/resources/test/puzzles/lightup/rules/TooManyBulbsContradictionRule/ManyBlocksEnclosed
This file was deleted.
Oops, something went wrong.
48 changes: 48 additions & 0 deletions
48
puzzles files/fillapix/10x10 Fillapix Advanced/FillapixAdvanced10x10_1
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| 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> |
File renamed without changes.
91 changes: 91 additions & 0 deletions
91
puzzles files/fillapix/15x15 Fillapix Advanced/FillapixAdvanced15x15_1
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| 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> |
Oops, something went wrong.