50 files changed, 52 insertions, 69 deletions
diff --git a/dice-lang/.gitignore b/base/.gitignore
index e8c76f2..e8c76f2 100644
--- a/dice-lang/.gitignore
+++ b/base/.gitignore
diff --git a/dice-lang/data/help/cli.help b/base/data/help/cli.help
index 433d5de..433d5de 100644
--- a/dice-lang/data/help/cli.help
+++ b/base/data/help/cli.help
diff --git a/dice-lang/lang-desc.md b/base/lang-desc.md
index fade9a0..fade9a0 100644
--- a/dice-lang/lang-desc.md
+++ b/base/lang-desc.md
diff --git a/dice-lang/lang-impl.md b/base/lang-impl.md
index c6c2ce2..c6c2ce2 100644
--- a/dice-lang/lang-impl.md
+++ b/base/lang-impl.md
diff --git a/dice-lang/lang-process.md b/base/lang-process.md
index 1175fca..1175fca 100644
--- a/dice-lang/lang-process.md
+++ b/base/lang-process.md
diff --git a/dice-lang/pom.xml b/base/pom.xml
index e1572ba..0fb24d7 100644
--- a/dice-lang/pom.xml
+++ b/base/pom.xml
@@ -1,55 +1,77 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
-	<groupId>bjc</groupId>
+
+	<parent>
+		<groupId>bjc</groupId>
+		<artifactId>dicelang-Parent</artifactId>
+		<version>1.0.0</version>
+	</parent>
+
 	<artifactId>dice-lang</artifactId>
-	<version>0.0.1-SNAPSHOT</version>
+	<packaging>jar</packaging>
+
 	<properties>
 		<main.class1>bjc.dicelang.scl.StreamControlConsole</main.class1>
 		<main.class>bjc.dicelang.DiceLangConsole</main.class>
 	</properties>
+
 	<build>
 		<sourceDirectory>src</sourceDirectory>
+
 		<plugins>
 			<plugin>
 				<artifactId>maven-compiler-plugin</artifactId>
-				<version>3.3</version>
+				<version>3.7.0</version>
+
 				<configuration>
 					<source>1.8</source>
 					<target>1.8</target>
 				</configuration>
 			</plugin>
+
 			<plugin>
 				<groupId>org.codehaus.mojo</groupId>
 				<artifactId>exec-maven-plugin</artifactId>
 				<version>1.5.0</version> 
+
 				<configuration>
 					<executable>java</executable>
+
 					<arguments>
 						<argument>-agentlib:jdwp=transport=dt_socket,server=y,suspend=n</argument>
 						<argument>-classpath</argument>
+
 						<classpath/>
+
 						<argument>${main.class}</argument>
 					</arguments>
+
 					<mainClass>${main.class}</mainClass>
 				</configuration>
 			</plugin>
+
 			<plugin>
 				<artifactId>maven-assembly-plugin</artifactId>
 				<version>3.0.0</version>
+
 				<configuration>
 					<descriptorRefs>
 						<descriptorRef>jar-with-dependencies</descriptorRef>
 					</descriptorRefs>
+
 					<archive>
 						<manifest>
 							<mainClass>${main.class}</mainClass>
 						</manifest>
 					</archive>
 				</configuration>
+
 				<executions>
 					<execution>
 						<id>make-assembly</id>
+
 						<phase>package</phase>
+
 						<goals>
 							<goal>single</goal>
 						</goals>
@@ -57,9 +79,11 @@
 				</executions>
 			</plugin>
 		</plugins>
+
 		<resources>
 			<resource>
 				<directory>data/</directory>
+
 				<includes>
 					<include>**/*.txt</include>
 					<include>**/*.help</include>
@@ -67,23 +91,26 @@
 			</resource>
 		</resources>
 	</build>
+
 	<repositories>
 		<repository>
-            <id>jline</id>
-            <name>JLine Project Repository</name>
+			<id>jline</id>
+			<name>JLine Project Repository</name>
 			<url>http://jline.sourceforge.net/m2repo</url>
-        </repository>
+		</repository>
 	</repositories>
+
 	<dependencies>
 		<dependency>
 			<groupId>bjc</groupId>
 			<artifactId>BJC-Utils2</artifactId>
-			<version>0.1.0-SNAPSHOT</version>
+			<version>1.0.0</version>
 		</dependency>
+
 		<dependency>
-				<groupId>jline</groupId>
-				<artifactId>jline</artifactId>
-				<version>0.9.9</version>
+			<groupId>jline</groupId>
+			<artifactId>jline</artifactId>
+			<version>0.9.9</version>
 		</dependency>
 	</dependencies>
 </project>
diff --git a/dice-lang/src/bjc/dicelang/CLIArgsParser.java b/base/src/bjc/dicelang/CLIArgsParser.java
index 54061bd..54061bd 100644
--- a/dice-lang/src/bjc/dicelang/CLIArgsParser.java
+++ b/base/src/bjc/dicelang/CLIArgsParser.java
diff --git a/dice-lang/src/bjc/dicelang/CompilerTweaker.java b/base/src/bjc/dicelang/CompilerTweaker.java
index 1154be4..1154be4 100644
--- a/dice-lang/src/bjc/dicelang/CompilerTweaker.java
+++ b/base/src/bjc/dicelang/CompilerTweaker.java
diff --git a/dice-lang/src/bjc/dicelang/Define.java b/base/src/bjc/dicelang/Define.java
index 5524477..5524477 100644
--- a/dice-lang/src/bjc/dicelang/Define.java
+++ b/base/src/bjc/dicelang/Define.java
diff --git a/dice-lang/src/bjc/dicelang/DiceLangConsole.java b/base/src/bjc/dicelang/DiceLangConsole.java
index 296874f..296874f 100644
--- a/dice-lang/src/bjc/dicelang/DiceLangConsole.java
+++ b/base/src/bjc/dicelang/DiceLangConsole.java
diff --git a/dice-lang/src/bjc/dicelang/DiceLangEngine.java b/base/src/bjc/dicelang/DiceLangEngine.java
index 71e5ee8..71e5ee8 100644
--- a/dice-lang/src/bjc/dicelang/DiceLangEngine.java
+++ b/base/src/bjc/dicelang/DiceLangEngine.java
diff --git a/dice-lang/src/bjc/dicelang/Errors.java b/base/src/bjc/dicelang/Errors.java
index 255db75..255db75 100644
--- a/dice-lang/src/bjc/dicelang/Errors.java
+++ b/base/src/bjc/dicelang/Errors.java
diff --git a/dice-lang/src/bjc/dicelang/Evaluator.java b/base/src/bjc/dicelang/Evaluator.java
index 10f7651..d817c42 100644
--- a/dice-lang/src/bjc/dicelang/Evaluator.java
+++ b/base/src/bjc/dicelang/Evaluator.java
@@ -6,11 +6,13 @@ import java.util.LinkedList;
 import java.util.function.Consumer;
 
 import bjc.dicelang.dice.CompoundDie;
+import bjc.dicelang.dice.Die;
 import bjc.dicelang.dice.FudgeDie;
 import bjc.dicelang.dice.MathDie;
 import bjc.dicelang.dice.ScalarDie;
 import bjc.dicelang.dice.SimpleDie;
 import bjc.dicelang.dice.SimpleDieList;
+
 import bjc.utils.data.ITree;
 import bjc.utils.data.SingleIterator;
 import bjc.utils.data.TopDownTransformIterator;
diff --git a/dice-lang/src/bjc/dicelang/EvaluatorResult.java b/base/src/bjc/dicelang/EvaluatorResult.java
index 3ceee9b..3ceee9b 100644
--- a/dice-lang/src/bjc/dicelang/EvaluatorResult.java
+++ b/base/src/bjc/dicelang/EvaluatorResult.java
diff --git a/dice-lang/src/bjc/dicelang/Node.java b/base/src/bjc/dicelang/Node.java
index 4238cfc..4238cfc 100644
--- a/dice-lang/src/bjc/dicelang/Node.java
+++ b/base/src/bjc/dicelang/Node.java
diff --git a/dice-lang/src/bjc/dicelang/Parser.java b/base/src/bjc/dicelang/Parser.java
index 0861e96..0861e96 100644
--- a/dice-lang/src/bjc/dicelang/Parser.java
+++ b/base/src/bjc/dicelang/Parser.java
diff --git a/dice-lang/src/bjc/dicelang/Shunter.java b/base/src/bjc/dicelang/Shunter.java
index 9d63b41..9d63b41 100644
--- a/dice-lang/src/bjc/dicelang/Shunter.java
+++ b/base/src/bjc/dicelang/Shunter.java
diff --git a/dice-lang/src/bjc/dicelang/Token.java b/base/src/bjc/dicelang/Token.java
index 2841973..2841973 100644
--- a/dice-lang/src/bjc/dicelang/Token.java
+++ b/base/src/bjc/dicelang/Token.java
diff --git a/dice-lang/src/bjc/dicelang/Tokenizer.java b/base/src/bjc/dicelang/Tokenizer.java
index 3e4a490..3e4a490 100644
--- a/dice-lang/src/bjc/dicelang/Tokenizer.java
+++ b/base/src/bjc/dicelang/Tokenizer.java
diff --git a/dice-lang/src/bjc/dicelang/dice/CompoundDie.java b/base/src/bjc/dicelang/dice/CompoundDie.java
index 0793872..0793872 100644
--- a/dice-lang/src/bjc/dicelang/dice/CompoundDie.java
+++ b/base/src/bjc/dicelang/dice/CompoundDie.java
diff --git a/dice-lang/src/bjc/dicelang/dice/CompoundingDie.java b/base/src/bjc/dicelang/dice/CompoundingDie.java
index 023282e..023282e 100644
--- a/dice-lang/src/bjc/dicelang/dice/CompoundingDie.java
+++ b/base/src/bjc/dicelang/dice/CompoundingDie.java
diff --git a/dice-lang/src/bjc/dicelang/dice/DiceBox.java b/base/src/bjc/dicelang/dice/DiceBox.java
index 8d00d96..8d00d96 100644
--- a/dice-lang/src/bjc/dicelang/dice/DiceBox.java
+++ b/base/src/bjc/dicelang/dice/DiceBox.java
diff --git a/dice-lang/src/bjc/dicelang/dice/Die.java b/base/src/bjc/dicelang/dice/Die.java
index 630e8b9..630e8b9 100644
--- a/dice-lang/src/bjc/dicelang/dice/Die.java
+++ b/base/src/bjc/dicelang/dice/Die.java
diff --git a/dice-lang/src/bjc/dicelang/dice/DieExpression.java b/base/src/bjc/dicelang/dice/DieExpression.java
index b8faeda..b8faeda 100644
--- a/dice-lang/src/bjc/dicelang/dice/DieExpression.java
+++ b/base/src/bjc/dicelang/dice/DieExpression.java
diff --git a/dice-lang/src/bjc/dicelang/dice/DieList.java b/base/src/bjc/dicelang/dice/DieList.java
index 48006d4..48006d4 100644
--- a/dice-lang/src/bjc/dicelang/dice/DieList.java
+++ b/base/src/bjc/dicelang/dice/DieList.java
diff --git a/dice-lang/src/bjc/dicelang/dice/ExplodingDice.java b/base/src/bjc/dicelang/dice/ExplodingDice.java
index e891a1c..e891a1c 100644
--- a/dice-lang/src/bjc/dicelang/dice/ExplodingDice.java
+++ b/base/src/bjc/dicelang/dice/ExplodingDice.java
diff --git a/dice-lang/src/bjc/dicelang/dice/FudgeDie.java b/base/src/bjc/dicelang/dice/FudgeDie.java
index 23951b2..23951b2 100644
--- a/dice-lang/src/bjc/dicelang/dice/FudgeDie.java
+++ b/base/src/bjc/dicelang/dice/FudgeDie.java
diff --git a/dice-lang/src/bjc/dicelang/dice/MathDie.java b/base/src/bjc/dicelang/dice/MathDie.java
index e4f2953..e4f2953 100644
--- a/dice-lang/src/bjc/dicelang/dice/MathDie.java
+++ b/base/src/bjc/dicelang/dice/MathDie.java
diff --git a/dice-lang/src/bjc/dicelang/dice/ScalarDie.java b/base/src/bjc/dicelang/dice/ScalarDie.java
index cbe9d3f..cbe9d3f 100644
--- a/dice-lang/src/bjc/dicelang/dice/ScalarDie.java
+++ b/base/src/bjc/dicelang/dice/ScalarDie.java
diff --git a/dice-lang/src/bjc/dicelang/dice/SimpleDie.java b/base/src/bjc/dicelang/dice/SimpleDie.java
index 6cae423..6cae423 100644
--- a/dice-lang/src/bjc/dicelang/dice/SimpleDie.java
+++ b/base/src/bjc/dicelang/dice/SimpleDie.java
diff --git a/dice-lang/src/bjc/dicelang/dice/SimpleDieList.java b/base/src/bjc/dicelang/dice/SimpleDieList.java
index 8391054..8391054 100644
--- a/dice-lang/src/bjc/dicelang/dice/SimpleDieList.java
+++ b/base/src/bjc/dicelang/dice/SimpleDieList.java
diff --git a/dice-lang/src/bjc/dicelang/expr/Ezpr.java b/base/src/bjc/dicelang/expr/Ezpr.java
index 862c097..862c097 100644
--- a/dice-lang/src/bjc/dicelang/expr/Ezpr.java
+++ b/base/src/bjc/dicelang/expr/Ezpr.java
diff --git a/dice-lang/src/bjc/dicelang/expr/Lexer.java b/base/src/bjc/dicelang/expr/Lexer.java
index dfa0f76..dfa0f76 100644
--- a/dice-lang/src/bjc/dicelang/expr/Lexer.java
+++ b/base/src/bjc/dicelang/expr/Lexer.java
diff --git a/dice-lang/src/bjc/dicelang/expr/Parser.java b/base/src/bjc/dicelang/expr/Parser.java
index 5fa2d3d..5fa2d3d 100644
--- a/dice-lang/src/bjc/dicelang/expr/Parser.java
+++ b/base/src/bjc/dicelang/expr/Parser.java
diff --git a/dice-lang/src/bjc/dicelang/expr/Shunter.java b/base/src/bjc/dicelang/expr/Shunter.java
index 213e473..213e473 100644
--- a/dice-lang/src/bjc/dicelang/expr/Shunter.java
+++ b/base/src/bjc/dicelang/expr/Shunter.java
diff --git a/dice-lang/src/bjc/dicelang/expr/Token.java b/base/src/bjc/dicelang/expr/Token.java
index bf92f97..bf92f97 100644
--- a/dice-lang/src/bjc/dicelang/expr/Token.java
+++ b/base/src/bjc/dicelang/expr/Token.java
diff --git a/dice-lang/src/bjc/dicelang/expr/TokenType.java b/base/src/bjc/dicelang/expr/TokenType.java
index ad01917..ad01917 100644
--- a/dice-lang/src/bjc/dicelang/expr/TokenType.java
+++ b/base/src/bjc/dicelang/expr/TokenType.java
diff --git a/dice-lang/src/bjc/dicelang/expr/Tokens.java b/base/src/bjc/dicelang/expr/Tokens.java
index 287d2b4..287d2b4 100644
--- a/dice-lang/src/bjc/dicelang/expr/Tokens.java
+++ b/base/src/bjc/dicelang/expr/Tokens.java
diff --git a/dice-lang/src/bjc/dicelang/scl/StreamControlConsole.java b/base/src/bjc/dicelang/scl/StreamControlConsole.java
index 649c6fa..649c6fa 100644
--- a/dice-lang/src/bjc/dicelang/scl/StreamControlConsole.java
+++ b/base/src/bjc/dicelang/scl/StreamControlConsole.java
diff --git a/dice-lang/src/bjc/dicelang/scl/StreamControlEngine.java b/base/src/bjc/dicelang/scl/StreamControlEngine.java
index d5e8b72..d5e8b72 100644
--- a/dice-lang/src/bjc/dicelang/scl/StreamControlEngine.java
+++ b/base/src/bjc/dicelang/scl/StreamControlEngine.java
diff --git a/dice-lang/src/bjc/dicelang/scl/StreamEngine.java b/base/src/bjc/dicelang/scl/StreamEngine.java
index 6e970b7..6e970b7 100644
--- a/dice-lang/src/bjc/dicelang/scl/StreamEngine.java
+++ b/base/src/bjc/dicelang/scl/StreamEngine.java
diff --git a/dice-lang/src/bjc/dicelang/util/ResourceLoader.java b/base/src/bjc/dicelang/util/ResourceLoader.java
index db5c6fc..db5c6fc 100644
--- a/dice-lang/src/bjc/dicelang/util/ResourceLoader.java
+++ b/base/src/bjc/dicelang/util/ResourceLoader.java
diff --git a/dice-lang/todos.txt b/base/todos.txt
index c83fe60..c83fe60 100644
--- a/dice-lang/todos.txt
+++ b/base/todos.txt
diff --git a/dice-lang/.DS_Store b/dice-lang/.DS_Store
deleted file mode 100644
index 44c6602..0000000
--- a/dice-lang/.DS_Store
+++ /dev/null
diff --git a/dice-lang/.classpath b/dice-lang/.classpath
deleted file mode 100644
index 149cb3c..0000000
--- a/dice-lang/.classpath
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" output="target/classes" path="src">
-		<attributes>
-			<attribute name="optional" value="true"/>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
-		<attributes>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
-		<attributes>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="output" path="target/classes"/>
-</classpath>
diff --git a/dice-lang/.project b/dice-lang/.project
deleted file mode 100644
index 20e0bea..0000000
--- a/dice-lang/.project
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>dice-lang</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.m2e.core.maven2Builder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.m2e.core.maven2Nature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
diff --git a/dice-lang/.settings/org.eclipse.jdt.core.prefs b/dice-lang/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 672496e..0000000
--- a/dice-lang/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,12 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.8
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
-org.eclipse.jdt.core.compiler.source=1.8
diff --git a/dice-lang/.settings/org.eclipse.m2e.core.prefs b/dice-lang/.settings/org.eclipse.m2e.core.prefs
deleted file mode 100644
index f897a7f..0000000
--- a/dice-lang/.settings/org.eclipse.m2e.core.prefs
+++ /dev/null
@@ -1,4 +0,0 @@
-activeProfiles=
-eclipse.preferences.version=1
-resolveWorkspaceProjects=true
-version=1
diff --git a/dice-lang/src/.DS_Store b/dice-lang/src/.DS_Store
deleted file mode 100644
index c5a38b7..0000000
--- a/dice-lang/src/.DS_Store
+++ /dev/null
diff --git a/pom.xml b/pom.xml
new file mode 100644
index 0000000..a40cb24
--- /dev/null
+++ b/pom.xml
@@ -0,0 +1,13 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+
+	<groupId>bjc</groupId>
+	<artifactId>dicelang-Parent</artifactId>
+	<version>1.0.0</version>
+	<packaging>pom</packaging>
+
+	<modules>
+		<module>base</module>
+	</modules>
+</project>