Merge branch 'master' into master

LICENSE

@@ -1,6 +1,6 @@
 Copyright (c) <year> <copyright holders>
 
-996 License Version 1.0 (Draft)
+Anti 996 License Version 1.0 (Draft)
 
 Permission is hereby granted to any individual or legal entity
 obtaining a copy of this licensed work (including the source code,

README.md

@@ -13,8 +13,10 @@
 相关报道
 =======
 
-《中国青年报》：[被“996”工作制围困的年轻人：像是定好闹钟的机器](http://zqb.cyol.com/html/2019-04/02/nw.D110000zgqnb_20190402_1-02.htm)
+- 《中国青年报》：[被“996”工作制围困的年轻人：像是定好闹钟的机器](http://zqb.cyol.com/html/2019-04/02/nw.D110000zgqnb_20190402_1-02.htm)
-《人民网》：[“996工作制”是谁的如意算盘？](http://opinion.people.com.cn/n1/2019/0402/c119388-31009768.html)
+- 《人民网》：[“996工作制”是谁的如意算盘？](http://opinion.people.com.cn/n1/2019/0402/c119388-31009768.html)
+- 《南方日报》：[正视年轻人压力“爆棚”的危险](http://epaper.southcn.com/nfdaily/html/2019-04/03/content_7790850.htm)
+
 
 什么是996？
 ---

README_EN.md

@@ -21,7 +21,7 @@ What can I do?
 
 - Update this [list](blacklist/blacklist.md) with evidence to help every worker.  
 - Add this [badge](externals/instruction.md) to your project to support 996.ICU.  
-- License your awesome projects with the [996ICU License](LICENSE).  
+- License your awesome projects with the [Anti 996 License](LICENSE).  
 - Add proposals to give advise and suggestion about the development of 996.ICU.
 
 
@@ -85,7 +85,7 @@ License
 
  - The purpose of this license is to prevent anti-labour-law companies from using the software or codes under the license, and force those companies to balance their work
  - See a [full list of projects](awesomelist/projects.md) under Anti-996 License
- - It is an idea of @xushunke: [Design A Software License Of Labor Protection -- 996ICU License](https://github.com/996icu/996.ICU/pull/15642)
+ - It is an idea of @xushunke: [Design A Software License Of Labor Protection -- Anti 996 License](https://github.com/996icu/996.ICU/pull/15642)
  - This version of Anti-996 License is drafted by [Katt Gu, J.D, University of Illinois, College of Law](https://scholar.google.com.sg/citations?user=PTcpQwcAAAAJ&hl=en&oi=ao); advised by [Suji Yan](https://www.linkedin.com/in/tedkoyan/), CEO of [Dimension](https://www.dimension.im).  
  - This draft is adapted from the MIT license. For more detailed explanation, please see [Wiki](https://github.com/kattgu7/996-License-Draft/wiki). This license is designed to be compatible with all major open source licenses.  
  - For law professionals or anyone who is willing to contribute to further version directly, please go to [Anti-996-License-1.0](https://github.com/kattgu7/996-License-Draft). Thank you.

awesomelist/projects.md

@@ -55,13 +55,13 @@ Projects under 996ICU License. Thanks for your support!
 | - | [FPN-SemanticSeg](https://github.com/ElephantGit/SemanticSegmentationUsingFPN_PanopticFeaturePyramidNetworks) | [FPN-SemanticSeg](https://github.com/ElephantGit/SemanticSegmentationUsingFPN_PanopticFeaturePyramidNetworks) | 一个使用FPN进行语义分割的实现|
 | - | [微信群聊游戏](https://github.com/Whoisurdady/WeChatRoomGame) | [Github](https://github.com/Whoisurdady/WeChatRoomGame) | 一个利用微信python api实现的聊天机器人和成语接龙游戏|
 | - | [SlideBack](https://github.com/ParfoisMeng/SlideBack) | [Github](https://github.com/ParfoisMeng/SlideBack) | (Android)无需继承的Activity侧滑返回库 类全面屏返回手势效果 仿“即刻”侧滑返回 |
-| - | [ata](https://github.com/yahtnif/ata) | [ata](https://github.com/yahtnif/ata) | axios + random useragent + encode url + ... |
+| <img width="60" src="https://github.com/yahtnif/static/raw/master/logo/ata.svg?sanitize=true"> | [ata](https://github.com/yahtnif/ata) | [Github](https://github.com/yahtnif/ata) | axios + auto encode url + ...<br />fetch style requests with `$` prefixed methods, like `axios-module`<br />support string proxy config like `127.0.0.1:9000` |
-| - | [foke](https://github.com/yahtnif/foke) | [foke](https://github.com/yahtnif/foke) | Simple job queue. |
+| <img width="60" src="https://github.com/yahtnif/static/raw/master/logo/foke.svg?sanitize=true"> | [foke](https://github.com/yahtnif/foke) | [Github](https://github.com/yahtnif/foke) | Simple job queues, with dash server. |
-| - | [ixi](https://github.com/yahtnif/ixi) | [ixi](https://github.com/yahtnif/ixi) | Structure selection parser. |
+| <img width="60" src="https://github.com/yahtnif/static/raw/master/logo/ixi.svg?sanitize=true"> | [ixi](https://github.com/yahtnif/ixi) | [Github](https://github.com/yahtnif/ixi) | Structure selection parser. |
-| - | [randelay](https://github.com/yahtnif/randelay) | [randelay](https://github.com/yahtnif/randelay) | Delay a promise a specified amount of time |
+| <img width="60" src="https://github.com/yahtnif/static/raw/master/logo/randelay.svg?sanitize=true"> | [randelay](https://github.com/yahtnif/randelay) | [Github](https://github.com/yahtnif/randelay) | Delay a promise a specified amount of time |
-| - | [random-mua](https://github.com/yahtnif/random-mua) | [random-mua](https://github.com/yahtnif/random-mua) | Random Modern User-Agent. |
+| <img width="60" src="https://github.com/yahtnif/static/raw/master/logo/random-mua.svg?sanitize=true"> | [random-mua](https://github.com/yahtnif/random-mua) | [Github](https://github.com/yahtnif/random-mua) | Random Modern User-Agent. |
-| - | [smarkdown](https://github.com/yahtnif/smarkdown) | [smarkdown](https://github.com/yahtnif/smarkdown) | Markdown parser, simplicity and extensibility. |
+| <img width="60" src="https://github.com/yahtnif/static/raw/master/logo/smarkdown.svg?sanitize=true"> | [smarkdown](https://github.com/yahtnif/smarkdown) | [Github](https://github.com/yahtnif/smarkdown) | Markdown parser, simplicity and extensibility. |
-| - | [suni](https://github.com/yahtnif/suni) | [suni](https://github.com/yahtnif/suni) | Arr, Hash, Is, Obj, Random, Str, Wrandom |
+| <img width="60" src="https://github.com/yahtnif/static/raw/master/logo/suni.svg?sanitize=true"> | [suni](https://github.com/yahtnif/suni) | [Github](https://github.com/yahtnif/suni) | Arr, Hash, Is, Obj, Random, Str, Wrandom |
 | <img src="https://github.com/EdgeTranslate/EdgeTranslate/raw/master/static/icon/icon48.png" width="60"> | [Edge Translate](https://github.com/EdgeTranslate/EdgeTranslate) | [GitHub](https://github.com/EdgeTranslate) / [Chrome Web Store](https://chrome.google.com/webstore/detail/bocbaocobfecmglnmeaeppambideimao) / [Firefox Add-ons](https://addons.mozilla.org/firefox/addon/edge_translate) | 一款支持多种浏览器的网页翻译插件 |
 | <img src="https://github.com/ame017/AMEGetterMaker/blob/master/intro/introduce.png?raw=true" width="60"> | [AMEGetterMaker](https://github.com/ame017/AMEGetterMaker) | [Github-AMEGetterMaker](https://github.com/ame017/AMEGetterMaker) | (Xcode)一个无需resign的Xcode懒加载生成器 |
 | <img src="https://raw.githubusercontent.com/ame017/AMECategoryMaker/master/Display/ACM-introduce.png" width="60"> | [AMECategoryMaker](https://github.com/ame017/AMECategoryMaker) | [Github-AMECategoryMaker](https://github.com/ame017/AMECategoryMaker) | (Xcode)一个无需resign的Xcode category生成器 |
@@ -82,3 +82,6 @@ Projects under 996ICU License. Thanks for your support!
 | - | [Privexec](https://github.com/M2Team/Privexec) | [Privexec](https://github.com/M2Team/Privexec) | Privexec 在 Windows 上使用指定的权限级别启动进程，包括 AppContainer |
 | - | [Clangbuilder](https://github.com/fstudio/clangbuilder) | [Clangbuilder](https://github.com/fstudio/clangbuilder) | Windows 系统下的 LLVM/Clang 自动化构建工具 |
 | <img src="https://github.com/M2Team/NSudo/blob/master/Logo.png?raw=true" width="60"> | [NSudo](https://github.com/M2Team/NSudo) | [NSudo](https://github.com/M2Team/NSudo) | NSudo - 一个强大的系统管理工具 |
+| - | [ARPG](https://raw.githubusercontent.com/ChangedenCZD/996.ICU/local/awesomelist/img/icon.chansos.com.png) | [Github](https://github/xxpniu/version/) | Unity 框架 支持行为编辑和技能时间轴编辑，用以快速搭建ARPG游戏框架 |
+| - | [myTranslate](https://github.com/Julyme/myTranslate) | [GitHub](https://github.com/Julyme/myTranslate) | 一款基于eclipse的插件，用于翻译。 |
+| <img src="https://github.com/ChanpleCai/SmartTaskbar/blob/master/logo/logo_blue.png" width="60"> | [SmartTaskbar](https://github.com/ChanpleCai/SmartTaskbar) | [Github](https://github.com/ChanpleCai/SmartTaskbar) | A Lightweight Windows Taskbar Enhancement Utility  |

blacklist/blacklist.md

@@ -1,4 +1,4 @@
-**请注意：维护本列表的目的在于为《中华人民共和国劳动法》的执行提供参考依据。**
+**请注意：维护本列表的目的在于为《中华人民共和国劳动法》的执行提供参考依据。**
 
 996（或其他违法加班制度）公司名单
 ===
@@ -69,6 +69,8 @@
 |上海|[蝴蝶互动](http://hoodinn.hgame.com/default/index)|2019年2月|966|[知乎：如何评价蝴蝶互动？](https://www.zhihu.com/question/40858342/answer/616999472) / [聊天记录截图](img/蝴蝶互动-聊天记录.png) / ([所受委托资料-0](img/蝴蝶互动-报告委托截图-0.jpg)  [所受委托资料-1](img/蝴蝶互动-报告委托截图-1.jpg))|
 |深圳|[深圳市世纪纵横科技发展有限公司](http://www.viothink.com/?tdsourcetag=s_pctim_aiomsg)|2019年4月|966、加班、拖延工资|[拖欠工资](img/chat1.png),[拖欠工资](img/chat2.png),[拖欠工资](img/chat3.png)。而且经常加班到1、2点[加班1](img/taxi.jpg)[加班2](img/taxi2.jpg)[加班3](img/taxi3.jpg)。周六是强制上班|
 |北京|[北京关键科技股份有限公司](http://www.keyware.com.cn/)|2019年3月|986|986且没加班费不能换休[图片-1](img/keware1.png) [图片-2](img/keyware2.png)|[公众号发布,说自发加班加点](https://mp.weixin.qq.com/s/3bB1csq2LYIWsvOjuHcAOQ)| 
+|济南|[山东国子软件股份有限公司](http://www.googosoft.com/)|2017年4月|886|加班补助说算在绩效中，时薪5块 : [加班表](img/googosoft.png)、[加班表](img/googosoft2.png)、[看准网1](https://www.kanzhun.com/pl6406106.html)、[看准网2](https://www.kanzhun.com/gsr5619934tl56.html?ka=review-label4)|
+|北京|[首约科技（北京）有限公司](https://www.01zhuanche.com/)|2019年3月|996|工作日无加班费无调休[图片-1](img/sq.png) [图片-2](img/sq2.png)|加班时长作为KPI评估标准| 
 
 更多不良公司（包括但不限于违法加班）请参见：
 [程序员找工作黑名单](https://github.com/shengxinjing/programmer-job-blacklist)

whitelist/whitelist.md

@@ -29,3 +29,4 @@
 |城市|公司|曝光时间|制度描述|证据内容|
 |:---:|:---:|:---:|:---:|:---:|
 |成都|[四川锦程消费金融有限责任公司](http://www.jccfc.com/)|2019年4月|915-530-5|[考勤规则通知邮件](img/timing_20190401111520.png)|
+|深圳/北京/广州/上海..|[EXPEDIA GROUP 亿客行](https://lifeatexpedia.com/jobs?location=china)|一直都是呀|5x8=40|[连这也可以成为买点?!](img/worklifebalance4you.jpg)|