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

merge-0.4.1 #1

Open
wants to merge 17 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
7 changes: 3 additions & 4 deletions .classpath
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@
</classpathentry>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17">
<attributes>
<attribute name="module" value="true"/>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
Expand All @@ -29,8 +28,8 @@
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="lib" path="lib/processing-4.0b8/core-4.0b8.jar"/>
<classpathentry kind="lib" path="lib/processing-4.0b8/gluegen-rt-4.0b8.jar"/>
<classpathentry kind="lib" path="lib/processing-4.0b8/jogl-all-4.0b8.jar"/>
<classpathentry kind="lib" path="lib/processing-4.0.1/core-4.0.1.jar"/>
<classpathentry kind="lib" path="lib/processing-4.0.1/gluegen-rt-4.0.1.jar"/>
<classpathentry kind="lib" path="lib/processing-4.0.1/jogl-all-4.0.1.jar"/>
<classpathentry kind="output" path="target/classes"/>
</classpath>
3 changes: 0 additions & 3 deletions .idea/.gitignore

This file was deleted.

28 changes: 0 additions & 28 deletions .idea/artifacts/LXStudio_IDE_jar.xml

This file was deleted.

7 changes: 2 additions & 5 deletions .idea/compiler.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions .idea/encodings.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

13 changes: 0 additions & 13 deletions .idea/libraries/Maven__com_google_code_gson_gson_2_8_9.xml

This file was deleted.

13 changes: 0 additions & 13 deletions .idea/libraries/Maven__com_heronarts_lx_0_4_0.xml

This file was deleted.

13 changes: 0 additions & 13 deletions .idea/libraries/Maven__com_heronarts_lxstudio_0_4_0.xml

This file was deleted.

13 changes: 0 additions & 13 deletions .idea/libraries/Maven__com_heronarts_p4lx_0_4_0.xml

This file was deleted.

This file was deleted.

This file was deleted.

13 changes: 0 additions & 13 deletions .idea/libraries/Maven__org_processing_core_4_0b2.xml

This file was deleted.

This file was deleted.

5 changes: 2 additions & 3 deletions .idea/misc.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 0 additions & 8 deletions .idea/modules.xml

This file was deleted.

13 changes: 0 additions & 13 deletions .idea/runConfigurations/LXStudioApp.xml

This file was deleted.

12 changes: 12 additions & 0 deletions .idea/runConfigurations/LXStudio_IDE.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .idea/vcs.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

63 changes: 63 additions & 0 deletions .idea/workspace.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 3 additions & 1 deletion Fixtures/Example.lxf
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
{
"fixtureType": "Cube",
"label": "Cube",

"tag": "cube",

"strips": [

Expand Down
Loading