Merge branch 'master' into development

NeuralEnsemble · Jun 11, 2024 · bbe6aba · bbe6aba
2 parents b439709 + 80a7ac9
commit bbe6aba
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 11 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -3,9 +3,9 @@ name: Java CI with Ant
 
 on:
   push:
-    branches:  [ master, development ]
+    branches:  [ master, development, experimental ]
   pull_request:
-    branches:  [ master, development ]
+    branches:  [ master, development, experimental ]
 
 jobs:
   build_and_test:

diff --git a/build.xml b/build.xml
@@ -27,9 +27,9 @@
 
     <tstamp/>
     <property name="name" value="neuroConstruct"/>
-    <property name="version" value="1.7.5"/>
+    <property name="version" value="1.7.6"/>
     <property name="version.impl" value="${version}"/>
-    <property name="year" value="2023"/>
+    <property name="year" value="2024"/>
 
     <echo message="----------- ${name} v${version} ------------"/>
 

diff --git a/nC.bat b/nC.bat
@@ -19,9 +19,9 @@ REM   than half your total physical memory is best.
 REM   *** ASKING FOR MORE MEMORY THAN HALF MAX ON WINDOWS HAS LED TO THE APPLICATION CRASHING ***
 set NC_MAX_MEMORY=500M
 
-set NC_VERSION=1.7.5
+set NC_VERSION=1.7.6
 
-set JNEUROML_VERSION=0.13.0
+set JNEUROML_VERSION=0.13.1
 
 REM -----------------------------
 REM   Should no longer be changed. **Very old version** of lems/nml libs...

diff --git a/nCenv.sh b/nCenv.sh
@@ -19,9 +19,9 @@ export NC_MAX_MEMORY=450M
 # The rest of the settings below shouldn't have to change
 
 # Current version of neuroConstruct
-export NC_VERSION=1.7.5
+export NC_VERSION=1.7.6
 
-export JNEUROML_VERSION=0.13.0
+export JNEUROML_VERSION=0.13.1
 
 #########
 # These are for **very old versions** of NML2/LEMS libraries...

diff --git a/nbproj/nbproject/project.xml b/nbproj/nbproject/project.xml
@@ -11,8 +11,8 @@
             <properties>
                 <property name="project.dir">..</property>
                 <property name="ant.script">${project.dir}/build.xml</property>
-                <property name="nC.version">1.7.5</property>
-                <property name="jneuroml.version">0.13.0</property>
+                <property name="nC.version">1.7.6</property>
+                <property name="jneuroml.version">0.13.1</property>
             </properties>
             <folders>
                 <source-folder>

diff --git a/src/ucl/physiol/neuroconstruct/project/GeneralProperties.java b/src/ucl/physiol/neuroconstruct/project/GeneralProperties.java
@@ -50,7 +50,7 @@ public class GeneralProperties
 
     private static final String packageOfCellTypes = "ucl.physiol.neuroconstruct.cell";
 
-    private static final String versionNumber = "1.7.5";
+    private static final String versionNumber = "1.7.6";
 
     //private static final String latestNeuroMLVersionNumber = "1.8.1";