diff --git a/.gitattributes b/.gitattributes deleted file mode 100644 index 412eeda78..000000000 --- a/.gitattributes +++ /dev/null @@ -1,22 +0,0 @@ -# Auto detect text files and perform LF normalization -* text=auto - -# Custom for Visual Studio -*.cs diff=csharp -*.sln merge=union -*.csproj merge=union -*.vbproj merge=union -*.fsproj merge=union -*.dbproj merge=union - -# Standard to msysgit -*.doc diff=astextplain -*.DOC diff=astextplain -*.docx diff=astextplain -*.DOCX diff=astextplain -*.dot diff=astextplain -*.DOT diff=astextplain -*.pdf diff=astextplain -*.PDF diff=astextplain -*.rtf diff=astextplain -*.RTF diff=astextplain diff --git a/.gitignore b/.gitignore deleted file mode 100644 index e48b472dd..000000000 --- a/.gitignore +++ /dev/null @@ -1,26 +0,0 @@ -*.* -!*.java -!*.txt -!*.png -!*.tcn -!*.gitmodules -!*.gitattributes -!*.properties -!*.xml -/*/ -LICENSE.txt -CHANGELOG - -!/src/ -!/Universal-Electricity/ -/src/minecraft/* -!/src/minecraft/fluidmech/ -!/src/minecraft/hydraulic/ -!/src/minecraft/org/ -!/resources/ -!info.txt -!publish.bat -!publish_obf.bat -!include.bat -!buildlocal.bat -!/README \ No newline at end of file diff --git a/.gitmodules b/.gitmodules deleted file mode 100644 index d9aa80e63..000000000 --- a/.gitmodules +++ /dev/null @@ -1,3 +0,0 @@ -[submodule "Universal-Electricity"] - path = Universal-Electricity - url = git://github.com/calclavia/Universal-Electricity diff --git a/Include.bat b/Include.bat deleted file mode 100644 index c08af8283..000000000 --- a/Include.bat +++ /dev/null @@ -1,4 +0,0 @@ -@echo off -cd resources -"..\..\..\7za.exe" a "..\jars\bin\minecraft.jar" "mods" -pause \ No newline at end of file diff --git a/jenkinsBuildScript.txt b/jenkinsBuildScript.txt deleted file mode 100644 index 00f060267..000000000 --- a/jenkinsBuildScript.txt +++ /dev/null @@ -1,37 +0,0 @@ -#!/bin/sh -e -MCP="${JENKINS_HOME}/workspace/Minecraft Forge/forge/mcp/" -MODVERSION="`head -n 1 modversion.txt`" -MCVERSION="`head -n 1 mcversion.txt`" - -FILE_NAME="Fluid_Mechanics_v${MODVERSION}.${BUILD_NUMBER}.jar" -API_NAME="Hydraulics_API_v${MODVERSION}.${BUILD_NUMBER}.zip" - -echo "Building ${JOB_NAME} version ${MODVERSION} build ${BUILD_NUMBER}" - -echo "Getting pre build MCP" -cp -rf "${MCP}"* . - -echo "Recompile" -./recompile.sh -echo "Reobfuscate_srg" -./reobfuscate_srg.sh - -# create this ahead of time... -mkdir output - -echo "Making ${API_NAME}" -cd src -zip -r9q "${WORKSPACE}/output/${API_NAME}" minecraft/hydraulic/* -cd .. - -echo "Making ${FILE_NAME}" -jar cf "output/${FILE_NAME}" -C reobf/minecraft/ ./fluidmech -jar uf "output/${FILE_NAME}" -C reobf/minecraft/ ./hydraulic -jar uf "output/${FILE_NAME}" -C reobf/minecraft/ ./org -jar uf "output/${FILE_NAME}" -C reobf/minecraft/ ./universalelectricity -jar uf "output/${FILE_NAME}" -C resources/ ./mods/fluidmech - -echo "Done." - -echo "Appending to info file" -echo "@ ${BUILD_NUMBER} ${MCVERSION} ${FILE_NAME} ${API_NAME}" >> "${JENKINS_HOME}/jobs/${JOB_NAME}/info.txt" \ No newline at end of file diff --git a/models/Archive/submittedPipe.tcn b/models/Archive/submittedPipe.tcn new file mode 100644 index 000000000..3329f7535 Binary files /dev/null and b/models/Archive/submittedPipe.tcn differ diff --git a/models/Current_Models/BasicPump.tcn b/models/Current_Models/BasicPump.tcn new file mode 100644 index 000000000..b84fc5a83 Binary files /dev/null and b/models/Current_Models/BasicPump.tcn differ diff --git a/models/Current_Models/ConstructionPump.tcn b/models/Current_Models/ConstructionPump.tcn new file mode 100644 index 000000000..b48de9384 Binary files /dev/null and b/models/Current_Models/ConstructionPump.tcn differ diff --git a/models/Current_Models/Generator.tcn b/models/Current_Models/Generator.tcn new file mode 100644 index 000000000..b5e106ceb Binary files /dev/null and b/models/Current_Models/Generator.tcn differ diff --git a/models/Current_Models/HandValve.tcn b/models/Current_Models/HandValve.tcn new file mode 100644 index 000000000..146aa984a Binary files /dev/null and b/models/Current_Models/HandValve.tcn differ diff --git a/models/Current_Models/LargePipe.tcn b/models/Current_Models/LargePipe.tcn new file mode 100644 index 000000000..fc32eb84a Binary files /dev/null and b/models/Current_Models/LargePipe.tcn differ diff --git a/models/Current_Models/Sink.tcn b/models/Current_Models/Sink.tcn new file mode 100644 index 000000000..d3e8c62ac Binary files /dev/null and b/models/Current_Models/Sink.tcn differ diff --git a/models/Current_Models/TankCorner2.tcn b/models/Current_Models/TankCorner2.tcn new file mode 100644 index 000000000..4ca8f7289 Binary files /dev/null and b/models/Current_Models/TankCorner2.tcn differ diff --git a/models/Current_Models/TankSingle2.tcn b/models/Current_Models/TankSingle2.tcn new file mode 100644 index 000000000..3715d4547 Binary files /dev/null and b/models/Current_Models/TankSingle2.tcn differ diff --git a/models/WIP/Condensor.tcn b/models/WIP/Condensor.tcn new file mode 100644 index 000000000..ef1c6c62d Binary files /dev/null and b/models/WIP/Condensor.tcn differ diff --git a/models/rejected/Pump3.tcn b/models/rejected/Pump3.tcn new file mode 100644 index 000000000..36082c36c Binary files /dev/null and b/models/rejected/Pump3.tcn differ diff --git a/models/rejected/PumpV2.tcn b/models/rejected/PumpV2.tcn new file mode 100644 index 000000000..ba009bf9e Binary files /dev/null and b/models/rejected/PumpV2.tcn differ diff --git a/models/rejected/something.tcn b/models/rejected/something.tcn new file mode 100644 index 000000000..080d6348a Binary files /dev/null and b/models/rejected/something.tcn differ diff --git a/recommendedversion.txt b/recommendedversion.txt deleted file mode 100644 index a863859a4..000000000 --- a/recommendedversion.txt +++ /dev/null @@ -1 +0,0 @@ -0.2.8