Skip to content
Snippets Groups Projects

Update new default file loc

Merged Terence CHAN requested to merge update-new-default-file-loc into main
  1. Apr 10, 2023
    • Simon Wang's avatar
      Small bug fix for missing parameter · cd8d4616
      Simon Wang authored
      cd8d4616
    • Simon Wang's avatar
      Merge branch 'main' into 'update-new-default-file-loc' · ea566550
      Simon Wang authored
      # Conflicts:
      #   application/src/main/kotlin/net/codebot/application/forge.kt
      ea566550
    • Terence-ChanLY's avatar
      Merge remote-tracking branch 'origin/main' into update-new-default-file-loc · 3415d259
      Terence-ChanLY authored
      # Conflicts:
      #	.gradle/buildOutputCleanup/buildOutputCleanup.lock
      #	.gradle/file-system.probe
      #	application/build/classes/kotlin/main/net/codebot/application/Forge.class
      #	application/build/classes/merged/net/codebot/application/Forge.class
      #	application/build/kotlin/compileKotlin/cacheable/caches-jvm/inputs/source-to-output.tab
      #	application/build/kotlin/compileKotlin/cacheable/caches-jvm/inputs/source-to-output.tab.values.at
      #	application/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/class-attributes.tab
      #	application/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/class-attributes.tab.values.at
      #	application/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab
      #	application/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab.values.at
      #	application/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/internal-name-to-source.tab
      #	application/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/internal-name-to-source.tab.values.at
      #	application/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/proto.tab
      #	application/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/proto.tab.values.at
      #	application/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/source-to-classes.tab
      #	application/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/source-to-classes.tab.values.at
      #	application/build/kotlin/compileKotlin/cacheable/caches-jvm/lookups/counters.tab
      #	application/build/kotlin/compileKotlin/cacheable/caches-jvm/lookups/file-to-id.tab
      #	application/build/kotlin/compileKotlin/cacheable/caches-jvm/lookups/file-to-id.tab.values.at
      #	application/build/kotlin/compileKotlin/cacheable/caches-jvm/lookups/id-to-file.tab
      #	application/build/kotlin/compileKotlin/cacheable/caches-jvm/lookups/id-to-file.tab.keystream
      #	application/build/kotlin/compileKotlin/cacheable/caches-jvm/lookups/id-to-file.tab.keystream.len
      #	application/build/kotlin/compileKotlin/cacheable/caches-jvm/lookups/id-to-file.tab.len
      #	application/build/kotlin/compileKotlin/cacheable/caches-jvm/lookups/id-to-file.tab.values.at
      #	application/build/kotlin/compileKotlin/cacheable/caches-jvm/lookups/id-to-file.tab_i
      #	application/build/kotlin/compileKotlin/cacheable/caches-jvm/lookups/lookups.tab
      #	application/build/kotlin/compileKotlin/cacheable/caches-jvm/lookups/lookups.tab.keystream
      #	application/build/kotlin/compileKotlin/cacheable/caches-jvm/lookups/lookups.tab.keystream.len
      #	application/build/kotlin/compileKotlin/cacheable/caches-jvm/lookups/lookups.tab.len
      #	application/build/kotlin/compileKotlin/cacheable/caches-jvm/lookups/lookups.tab.values.at
      #	application/build/kotlin/compileKotlin/cacheable/caches-jvm/lookups/lookups.tab_i
      #	application/build/kotlin/compileKotlin/cacheable/last-build.bin
      #	application/build/kotlin/compileKotlin/localstate/build-history.bin
      #	application/build/libs/application-1.0.0.jar
      #	application/build/tmp/compileJava/previous-compilation-data.bin
      3415d259
    • Dan Duran's avatar
      fixes font changing when theme changes · 164cb59d
      Dan Duran authored
      164cb59d
    • Terence-ChanLY's avatar
      ce07892a
Loading