From b30a5dca5bffd97c476320d362e53b5f85b3d597 Mon Sep 17 00:00:00 2001 From: Orlando M Guerreiro Date: Sun, 25 May 2025 23:50:55 +0100 Subject: [PATCH] Resolve merge conflits --- .gitignore | 1 + .../oguerreiro_formatter_profile.xml | 404 ++++++++++++++++++ .../resilient - Start DEBUG (Full).launch | 21 + ...ent - Start DEBUG (ServerSide Only).launch | 21 + 4 files changed, 447 insertions(+) create mode 100644 ide/eclipse/formatter/oguerreiro_formatter_profile.xml create mode 100644 ide/eclipse/run-configs/resilient - Start DEBUG (Full).launch create mode 100644 ide/eclipse/run-configs/resilient - Start DEBUG (ServerSide Only).launch diff --git a/.gitignore b/.gitignore index ac0be29..ccf24b3 100644 --- a/.gitignore +++ b/.gitignore @@ -9,6 +9,7 @@ Thumbs.db .idea/ .vscode/ *.iml +.factorypath # Build & dependencies (Java) target/ diff --git a/ide/eclipse/formatter/oguerreiro_formatter_profile.xml b/ide/eclipse/formatter/oguerreiro_formatter_profile.xml new file mode 100644 index 0000000..05f92ff --- /dev/null +++ b/ide/eclipse/formatter/oguerreiro_formatter_profile.xml @@ -0,0 +1,404 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ide/eclipse/run-configs/resilient - Start DEBUG (Full).launch b/ide/eclipse/run-configs/resilient - Start DEBUG (Full).launch new file mode 100644 index 0000000..b006203 --- /dev/null +++ b/ide/eclipse/run-configs/resilient - Start DEBUG (Full).launch @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/ide/eclipse/run-configs/resilient - Start DEBUG (ServerSide Only).launch b/ide/eclipse/run-configs/resilient - Start DEBUG (ServerSide Only).launch new file mode 100644 index 0000000..9da7a1b --- /dev/null +++ b/ide/eclipse/run-configs/resilient - Start DEBUG (ServerSide Only).launch @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + + + + + + + +