replaced occurrences of "AMIDST" by "Amidst", when used as a title, or "amidst", when used as an identifier

master
Stefan Dollase 2015-12-30 19:52:04 +01:00
parent 93f3a24383
commit cca131775b
11 changed files with 24 additions and 24 deletions

View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<projectDescription> <projectDescription>
<name>AMIDST</name> <name>amidst</name>
<comment></comment> <comment></comment>
<projects> <projects>
</projects> </projects>

View File

@ -25,5 +25,5 @@ deploy:
- "target/${filename}.exe" - "target/${filename}.exe"
skip_cleanup: true skip_cleanup: true
on: on:
repo: stefandollase/AMIDST repo: stefandollase/amidst
tags: true tags: true

View File

@ -1,16 +1,16 @@
AMIDST Amidst
====== ======
[![Build Status](https://travis-ci.org/stefandollase/AMIDST.svg)](https://travis-ci.org/stefandollase/AMIDST) [![Build Status](https://travis-ci.org/stefandollase/amidst.svg)](https://travis-ci.org/stefandollase/amidst)
Advanced Minecraft Interface and Data/Structure Tracking Advanced Minecraft Interface and Data/Structure Tracking
Where can I get AMIDST? Where can I get Amidst?
----------------------- -----------------------
You can download amidst [here](https://github.com/skiphs/AMIDST/releases/latest). If you find any bugs, please [report](https://github.com/skiphs/AMIDST/issues/new) them so we can fix them. If you want to request a feature, you can to this [here](https://github.com/skiphs/AMIDST/issues/new). If you want to help develop amidst, please get in contact [here](https://github.com/skiphs/AMIDST/issues/new). Lastly, [here](https://github.com/stefandollase/AMIDST/blob/refactoring/docs/HOW-TO-BUILD.md) is a description how you can build amidst by yourself. You can download amidst [here](https://github.com/skiphs/amidst/releases/latest). If you find any bugs, please [report](https://github.com/skiphs/amidst/issues/new) them so we can fix them. If you want to request a feature, you can to this [here](https://github.com/skiphs/amidst/issues/new). If you want to help develop amidst, please get in contact [here](https://github.com/skiphs/amidst/issues/new). Lastly, [here](https://github.com/stefandollase/amidst/blob/refactoring/docs/BUILDING.md) is a description how you can build amidst by yourself.
What is AMIDST? What is Amidst?
--------------- ---------------
What it **can** do for you: What it **can** do for you:
@ -50,7 +50,7 @@ More features include:
Which Minecraft versions are supported? Which Minecraft versions are supported?
--------------------------------------- ---------------------------------------
We support Minecraft versions from 1.0 up to the latest snapshot. If you find an issue with a specific Minecraft version, [please report it](https://github.com/skiphs/AMIDST/issues/new). We support Minecraft versions from 1.0 up to the latest snapshot. If you find an issue with a specific Minecraft version, [please report it](https://github.com/skiphs/amidst/issues/new).
How can I move a player? How can I move a player?
------------------------ ------------------------
@ -94,5 +94,5 @@ Amidst is not owned by or related to mojang in any way.
License and warranty License and warranty
-------------------- --------------------
AMIDST comes with ABSOLUTELY NO WARRANTY. It is free and open source software, license under the Amidst comes with ABSOLUTELY NO WARRANTY. It is free and open source software, license under the
[GPL v3](https://github.com/skiphs/AMIDST/blob/master/LICENSE.txt), and you are welcome to redistribute it under certain conditions. [GPL v3](https://github.com/skiphs/amidst/blob/master/LICENSE.txt), and you are welcome to redistribute it under certain conditions.

View File

@ -6,7 +6,7 @@ Amidst uses maven for its build process. Here are the steps to build from source
* `mvn clean` * `mvn clean`
* `mvn install` * `mvn install`
This will place the jar file under `target/AMIDST-<version>.jar`. This will place the jar file under `target/amidst-<version>.jar`.
To build the wrapper for mac, follow these steps: To build the wrapper for mac, follow these steps:
@ -16,7 +16,7 @@ To build the wrapper for mac, follow these steps:
* `mvn package -DskipTests=true -f travis-ci/wrapper-for-mac/pom.xml` * `mvn package -DskipTests=true -f travis-ci/wrapper-for-mac/pom.xml`
* `bash travis-ci/scripts/zip-and-move-wrapper-for-mac.sh` * `bash travis-ci/scripts/zip-and-move-wrapper-for-mac.sh`
This will place the zip file under `target/AMIDST-<version>.zip`. This will place the zip file under `target/amidst-<version>.zip`.
To build the wrapper for windows, follow these steps: To build the wrapper for windows, follow these steps:
@ -25,10 +25,10 @@ To build the wrapper for windows, follow these steps:
* `bash travis-ci/scripts/create-windows-icon.sh` * `bash travis-ci/scripts/create-windows-icon.sh`
* `mvn package -DskipTests=true -f travis-ci/wrapper-for-windows/pom.xml` * `mvn package -DskipTests=true -f travis-ci/wrapper-for-windows/pom.xml`
This will place the exe file under `target/AMIDST-<version>.exe`. This will place the exe file under `target/amidst-<version>.exe`.
You will need imagemagick installed to create the icons. Of course, you can also create the icon files by yourself and place them as `target/icon.icns` (mac) or `target/icon.ico` (windows) to the expected location. The `zip-and-move-wrapper-for-mac.sh` bash script simply creates a zip file from the directory located at `travis-ci/wrapper-for-mac/target/AMIDST-<version>/`. You can also do this by yourself. You will need imagemagick installed to create the icons. Of course, you can also create the icon files by yourself and place them as `target/icon.icns` (mac) or `target/icon.ico` (windows) to the expected location. The `zip-and-move-wrapper-for-mac.sh` bash script simply creates a zip file from the directory located at `travis-ci/wrapper-for-mac/target/amidst-<version>/`. You can also do this by yourself.
All of these steps are also executed by travis-ci to create a new release. However the regular travis-ci build will not create the wrappers for mac and windows. All of these steps are also executed by travis-ci to create a new release. However the regular travis-ci build will not create the wrappers for mac and windows.
The command `mvn clean` will actually install a dependency that is not available from a public maven repository to the local maven repository, so it is necessary to execute. The command `mvn clean` will actually install a dependency that is not available from a public maven repository to the local maven repository, so it is necessary to execute.

View File

@ -21,9 +21,9 @@ public class CrashWindow {
public CrashWindow(String message, String logMessages, public CrashWindow(String message, String logMessages,
final Runnable executeOnClose) { final Runnable executeOnClose) {
frame = new JFrame("AMIDST encountered an unexpected error."); frame = new JFrame("Amidst encountered an unexpected error.");
frame.getContentPane().setLayout(new MigLayout()); frame.getContentPane().setLayout(new MigLayout());
frame.add(new JLabel("AMIDST has crashed with the following message:"), frame.add(new JLabel("Amidst has crashed with the following message:"),
"growx, pushx, wrap"); "growx, pushx, wrap");
frame.add(new JLabel(message), "growx, pushx, wrap"); frame.add(new JLabel(message), "growx, pushx, wrap");
frame.add(createLogMessagesScrollPane(logMessages), "grow, push"); frame.add(createLogMessagesScrollPane(logMessages), "grow, push");

View File

@ -36,7 +36,7 @@ public class LicenseWindow {
private License[] createLicenses() { private License[] createLicenses() {
List<License> result = Arrays.asList( List<License> result = Arrays.asList(
createLicense("AMIDST", "amidst.txt"), createLicense("Amidst", "amidst.txt"),
createLicense("Args4j", "args4j.txt"), createLicense("Args4j", "args4j.txt"),
createLicense("Gson", "gson.txt"), createLicense("Gson", "gson.txt"),
createLicense("JNBT", "jnbt.txt"), createLicense("JNBT", "jnbt.txt"),

View File

@ -244,7 +244,7 @@ public class Actions {
@CalledOnlyBy(AmidstThread.EDT) @CalledOnlyBy(AmidstThread.EDT)
public void about() { public void about() {
mainWindow.displayMessage("About", mainWindow.displayMessage("About",
"Advanced Minecraft Interfacing and Data/Structure Tracking (AMIDST)\n" "Advanced Minecraft Interfacing and Data/Structure Tracking (Amidst)\n"
+ "By Skidoodle (amidst.project@gmail.com)"); + "By Skidoodle (amidst.project@gmail.com)");
} }

View File

@ -26,7 +26,7 @@ public interface MinecraftInterface {
* paramaters must all correspond to a quarter of the Minecraft * paramaters must all correspond to a quarter of the Minecraft
* block coordinates/sizes you wish to obtain the biome data for. * block coordinates/sizes you wish to obtain the biome data for.
* *
* AMIDST displays the quarter-resolution biome map, however full * Amidst displays the quarter-resolution biome map, however full
* resolution is required to determine the position and nature of * resolution is required to determine the position and nature of
* structures, as the noisy interpolation can change which biome * structures, as the noisy interpolation can change which biome
* a structure is located in (if the structure is located on a * a structure is located in (if the structure is located on a

View File

@ -1,5 +1,5 @@
project.build.sourceEncoding=UTF-8 project.build.sourceEncoding=UTF-8
amidst.build.filename=AMIDST-v4.0-alpha3 amidst.build.filename=amidst-v4.0-alpha3
amidst.build.jdk.version=1.8 amidst.build.jdk.version=1.8
amidst.version.major=4 amidst.version.major=4

View File

@ -2,5 +2,5 @@
filename="`source travis-ci/scripts/get-amidst-filename.sh`" filename="`source travis-ci/scripts/get-amidst-filename.sh`"
cd "travis-ci/wrapper-for-mac/target/${filename}/" cd "travis-ci/wrapper-for-mac/target/${filename}/"
zip -r "${filename}.zip" "AMIDST.app/" zip -r "${filename}.zip" "Amidst.app/"
mv "${filename}.zip" "../../../../target/" mv "${filename}.zip" "../../../../target/"

View File

@ -39,7 +39,7 @@
<mainClass>amidst.Amidst</mainClass> <mainClass>amidst.Amidst</mainClass>
<iconFile>../../target/icon.icns</iconFile> <iconFile>../../target/icon.icns</iconFile>
<jvmVersion>${amidst.build.jdk.version}+</jvmVersion> <jvmVersion>${amidst.build.jdk.version}+</jvmVersion>
<bundleName>AMIDST</bundleName> <bundleName>Amidst</bundleName>
</configuration> </configuration>
</execution> </execution>
</executions> </executions>
@ -67,4 +67,4 @@
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
</dependencies> </dependencies>
</project> </project>