Commits · 4a29b73ed105d34932d96d32d729d04c9046e468 · nanahira / srvpro

23 May, 2020 11 commits
- Merge branch 'master' into tcg_random · 4a29b73e
  nanahira authored May 23, 2020
  
  4a29b73e
- fixmerge · 56eae580
  nanahira authored May 23, 2020
  
  56eae580
- Merge branch 'master' into tcg_random · 29574e85
  nanahira authored May 23, 2020
  
  29574e85
- fixmerge · e3a037c3
  nanahira authored May 23, 2020
  
  e3a037c3
- Merge branch 'master' into tcg_random · 9f23dfb9
  nanahira authored May 23, 2020
  
  9f23dfb9
- Merge branch 'mc' · 70fa03e9
  nanahira authored May 23, 2020
  
  70fa03e9
- Revert "prevent config being overwritten" · 7d83b582
  nanahira authored May 23, 2020
```
This reverts commit 5f49702a.
```
  7d83b582
- would not start if invalid config · b201e1d9
  nanahira authored May 23, 2020
  
  b201e1d9
- Merge branch 'master' into tcg_random · c9a4647d
  nanahira authored May 23, 2020
  
  c9a4647d
- Merge branch 'mc' · 872778dd
  nanahira authored May 23, 2020
  
  872778dd
- prevent config being overwritten · 5f49702a
  nanahira authored May 23, 2020
  
  5f49702a
19 May, 2020 2 commits
- Merge branch 'master' into tcg_random · be756986
  nanahira authored May 19, 2020
  
  be756986
- Merge branch 'master' of github.com:moecube/srvpro · 96e236f3
  nanahira authored May 19, 2020
  
  96e236f3
18 May, 2020 2 commits
- fix welcome · 3ce3b6b7
  mercury233 authored May 18, 2020
  
  3ce3b6b7
- update pre util to generate ypk · c2c5fbd9
  mercury233 authored May 18, 2020
  
  c2c5fbd9
10 May, 2020 13 commits
- Merge branch 'master' into tcg_random · 13e1ab2f
  nanahira authored May 10, 2020
  
  13e1ab2f
- Merge branch 'mc' · 3366728b
  nanahira authored May 10, 2020
  
  3366728b
- fix · 9e6956ef
  nanahira authored May 10, 2020
  
  9e6956ef
- Merge branch 'master' into tcg_random · 7982113f
  nanahira authored May 10, 2020
  
  7982113f
- Merge branch 'mc' · 227b11d3
  nanahira authored May 10, 2020
  
  227b11d3
- fix · c3238bf8
  nanahira authored May 10, 2020
  
  c3238bf8
- Merge branch 'master' into tcg_random · 4eea6e22
  nanahira authored May 10, 2020
  
  4eea6e22
- Merge branch 'mc' · 9aff2746
  nanahira authored May 10, 2020
  
  9aff2746
- fix · 47e43a7a
  nanahira authored May 10, 2020
  
  47e43a7a
- Merge branch 'master' into tcg_random · 50cca341
  nanahira authored May 10, 2020
  
  50cca341
- Merge branch 'mc' · 8785a2ea
  nanahira authored May 10, 2020
  
  8785a2ea
- random seed at all · 235fad59
  nanahira authored May 10, 2020
  
  235fad59
- fix recover · 70290bf9
  nanahira authored May 10, 2020
  
  70290bf9
09 May, 2020 5 commits
- Merge branch 'mc' · dfeaa0b7
  nanahira authored May 09, 2020
  
  dfeaa0b7
- Merge branch 'master' of github.com:moecube/srvpro into mc · bad8e126
  nanahira authored May 09, 2020
  
  bad8e126
- Merge branch 'master' into tcg_random · 072343dd
  nanahira authored May 09, 2020
  
  072343dd
- Merge branch 'mc' · efeac6cb
  nanahira authored May 09, 2020
  
  efeac6cb
- fix · c8d7cdaf
  nanahira authored May 09, 2020
  
  c8d7cdaf
08 May, 2020 7 commits
- Merge branch 'master' into tcg_random · 134db817
  nanahira authored May 08, 2020
  
  134db817
- Merge branch 'master' of github.com:moecube/srvpro · b262b9ce
  nanahira authored May 08, 2020
  
  b262b9ce
- Update default_config.json · a4761963
  nanahira authored May 08, 2020
  
  a4761963
- Merge branch 'master' into tcg_random · 174ae334
  nanahira authored May 08, 2020
  
  174ae334
- Merge branch 'mc' · 62a7b9fb
  nanahira authored May 08, 2020
  
  62a7b9fb
- fix recover with same name · f0b61497
  nanahira authored May 08, 2020
  
  f0b61497
- Merge branch 'master' into tcg_random · d5d5a184
  nanahira authored May 08, 2020
  
  d5d5a184