Merge branch 'master' into staging

This commit is contained in:
Alessandro Pezzè 2023-01-15 19:33:15 +01:00
commit 65e3354938
2 changed files with 36239 additions and 0 deletions

View file

@ -1181,6 +1181,7 @@ pokemon_id,ability_id,is_hidden,slot
474,88,0,2 474,88,0,2
474,148,1,3 474,148,1,3
475,80,0,1 475,80,0,1
475,292,0,2
475,154,1,3 475,154,1,3
476,5,0,1 476,5,0,1
476,42,0,2 476,42,0,2
@ -2603,3 +2604,304 @@ pokemon_id,ability_id,is_hidden,slot
10248,91,0,2 10248,91,0,2
10248,104,1,3 10248,104,1,3
10249,142,0,1 10249,142,0,1
905,56,0,1
905,126,1,3
906,65,0,1
906,168,1,3
907,65,0,1
907,168,1,3
908,65,0,1
908,168,1,3
909,66,0,1
909,109,1,3
910,66,0,1
910,109,1,3
911,66,0,1
911,109,1,3
912,67,0,1
912,153,1,3
913,67,0,1
913,153,1,3
914,67,0,1
914,153,1,3
915,165,0,1
915,82,0,2
915,47,1,3
916,268,0,1
916,82,0,2
916,47,1,3
917,32,0,1
917,50,0,2
917,155,1,3
918,15,0,1
918,198,1,3
919,15,0,1
919,198,1,3
920,68,0,1
920,110,1,3
921,68,0,1
921,110,1,3
922,14,0,1
922,61,1,3
923,28,0,1
923,140,1,3
924,53,0,1
924,218,1,3
925,146,0,1
925,218,1,3
926,107,0,1
926,119,0,2
926,3,1,3
927,290,0,1
927,119,0,2
927,3,1,3
928,291,0,1
928,296,0,2
928,157,1,3
929,183,0,1
929,155,0,2
929,8,1,3
930,183,0,1
930,155,0,2
930,8,1,3
931,109,0,1
931,12,0,2
931,41,1,3
932,104,0,1
932,292,1,3
933,41,0,1
933,41,1,3
934,278,0,1
934,278,1,3
935,48,0,1
935,139,1,3
936,48,0,1
936,139,1,3
937,269,0,1
937,139,1,3
938,34,0,1
938,15,0,2
938,103,1,3
939,34,0,1
939,15,0,2
939,141,1,3
940,20,0,1
940,9,0,2
940,6,1,3
941,280,0,1
941,9,0,2
941,6,1,3
942,142,0,1
942,112,1,3
943,142,0,1
943,111,1,3
944,297,0,1
944,8,1,3
945,50,0,1
945,53,0,2
945,20,1,3
946,132,0,1
946,167,0,2
946,101,1,3
947,47,0,1
947,81,0,2
947,125,1,3
948,47,0,1
948,202,0,2
948,125,1,3
949,270,0,1
949,115,1,3
950,270,0,1
950,115,1,3
951,270,0,1
951,115,1,3
952,279,0,1
952,114,1,3
953,61,0,1
953,144,1,3
954,9,0,1
954,30,0,2
954,89,1,3
955,10,0,1
955,30,0,2
955,89,1,3
956,10,0,1
956,30,0,2
956,89,1,3
957,277,0,1
957,10,0,2
957,172,1,3
958,277,0,1
958,10,0,2
958,172,1,3
959,145,0,1
959,51,0,2
959,276,1,3
960,22,0,1
960,55,0,2
960,62,1,3
961,113,0,1
961,77,0,2
961,294,1,3
962,271,0,1
962,75,0,2
962,144,1,3
963,272,0,1
963,5,0,2
963,29,1,3
964,272,0,1
964,5,0,2
964,29,1,3
965,272,0,1
965,5,0,2
965,29,1,3
966,295,0,1
966,212,1,3
967,295,0,1
967,212,1,3
968,84,0,1
968,124,0,2
968,158,1,3
969,84,0,1
969,143,0,2
969,158,1,3
970,20,0,1
970,103,1,3
971,273,0,1
971,165,1,3
972,22,0,1
972,50,0,2
972,198,1,3
973,22,0,1
973,275,0,2
973,198,1,3
974,274,0,1
974,151,1,3
975,274,0,1
975,151,1,3
976,155,0,1
976,155,1,3
977,283,0,1
977,283,1,3
978,281,0,1
978,281,1,3
979,281,0,1
979,281,1,3
981,281,0,1
981,281,1,3
982,281,0,1
982,281,1,3
983,281,0,1
983,281,1,3
984,281,0,1
984,281,1,3
985,281,0,1
985,281,1,3
986,282,0,1
986,282,1,3
988,282,0,1
988,282,1,3
989,282,0,1
989,282,1,3
990,282,0,1
990,282,1,3
991,282,0,1
991,282,1,3
992,282,0,1
992,282,1,3
993,282,0,1
993,282,1,3
994,284,0,1
994,284,1,3
995,285,0,1
995,285,1,3
996,286,0,1
996,286,1,3
997,287,0,1
997,287,1,3
998,288,0,1
998,288,1,3
999,289,0,1
999,289,1,3
1000,104,0,1
1000,20,0,2
1000,124,1,3
1001,104,0,1
1001,20,0,2
1001,124,1,3
1002,104,0,1
1002,20,0,2
1002,124,1,3
1003,18,0,1
1003,49,1,3
1004,18,0,1
1004,133,1,3
1005,18,0,1
1005,133,1,3
1006,298,0,1
1006,298,1,3
1007,298,0,1
1007,298,1,3
1008,128,0,1
1008,293,0,2
1008,46,1,3
1009,38,0,1
1009,11,0,2
1009,109,1,3
1010,72,0,1
1010,39,0,2
1010,128,1,3
10250,22,0,1
10250,83,0,2
10250,291,1,3
10251,22,0,1
10251,83,0,2
10251,291,1,3
10252,22,0,1
10252,83,0,2
10252,291,1,3
10253,38,0,1
10253,11,0,2
10253,109,1,3
10254,165,0,1
10254,82,0,2
10254,47,1,3
10255,32,0,1
10255,50,0,2
10255,155,1,3
10256,278,0,1
10256,278,1,3
10257,132,0,1
10257,167,0,2
10257,101,1,3
10258,279,0,1
10258,114,1,3
10259,279,0,1
10259,114,1,3
10260,22,0,1
10260,55,0,2
10260,62,1,3
10261,22,0,1
10261,55,0,2
10261,125,1,3
10262,22,0,1
10262,55,0,2
10262,125,1,3
10263,50,0,1
10263,50,1,3
10264,288,0,1
10264,288,1,3
10265,288,0,1
10265,288,1,3
10266,288,0,1
10266,288,1,3
10267,288,0,1
10267,288,1,3
10268,289,0,1
10268,289,1,3
10269,289,0,1
10269,289,1,3
10270,289,0,1
10270,289,1,3
10271,289,0,1
10271,289,1,3

1 pokemon_id ability_id is_hidden slot
1181 474 88 0 2
1182 474 148 1 3
1183 475 80 0 1
1184 475 292 0 2
1185 475 154 1 3
1186 476 5 0 1
1187 476 42 0 2
2604 10248 91 0 2
2605 10248 104 1 3
2606 10249 142 0 1
2607 905 56 0 1
2608 905 126 1 3
2609 906 65 0 1
2610 906 168 1 3
2611 907 65 0 1
2612 907 168 1 3
2613 908 65 0 1
2614 908 168 1 3
2615 909 66 0 1
2616 909 109 1 3
2617 910 66 0 1
2618 910 109 1 3
2619 911 66 0 1
2620 911 109 1 3
2621 912 67 0 1
2622 912 153 1 3
2623 913 67 0 1
2624 913 153 1 3
2625 914 67 0 1
2626 914 153 1 3
2627 915 165 0 1
2628 915 82 0 2
2629 915 47 1 3
2630 916 268 0 1
2631 916 82 0 2
2632 916 47 1 3
2633 917 32 0 1
2634 917 50 0 2
2635 917 155 1 3
2636 918 15 0 1
2637 918 198 1 3
2638 919 15 0 1
2639 919 198 1 3
2640 920 68 0 1
2641 920 110 1 3
2642 921 68 0 1
2643 921 110 1 3
2644 922 14 0 1
2645 922 61 1 3
2646 923 28 0 1
2647 923 140 1 3
2648 924 53 0 1
2649 924 218 1 3
2650 925 146 0 1
2651 925 218 1 3
2652 926 107 0 1
2653 926 119 0 2
2654 926 3 1 3
2655 927 290 0 1
2656 927 119 0 2
2657 927 3 1 3
2658 928 291 0 1
2659 928 296 0 2
2660 928 157 1 3
2661 929 183 0 1
2662 929 155 0 2
2663 929 8 1 3
2664 930 183 0 1
2665 930 155 0 2
2666 930 8 1 3
2667 931 109 0 1
2668 931 12 0 2
2669 931 41 1 3
2670 932 104 0 1
2671 932 292 1 3
2672 933 41 0 1
2673 933 41 1 3
2674 934 278 0 1
2675 934 278 1 3
2676 935 48 0 1
2677 935 139 1 3
2678 936 48 0 1
2679 936 139 1 3
2680 937 269 0 1
2681 937 139 1 3
2682 938 34 0 1
2683 938 15 0 2
2684 938 103 1 3
2685 939 34 0 1
2686 939 15 0 2
2687 939 141 1 3
2688 940 20 0 1
2689 940 9 0 2
2690 940 6 1 3
2691 941 280 0 1
2692 941 9 0 2
2693 941 6 1 3
2694 942 142 0 1
2695 942 112 1 3
2696 943 142 0 1
2697 943 111 1 3
2698 944 297 0 1
2699 944 8 1 3
2700 945 50 0 1
2701 945 53 0 2
2702 945 20 1 3
2703 946 132 0 1
2704 946 167 0 2
2705 946 101 1 3
2706 947 47 0 1
2707 947 81 0 2
2708 947 125 1 3
2709 948 47 0 1
2710 948 202 0 2
2711 948 125 1 3
2712 949 270 0 1
2713 949 115 1 3
2714 950 270 0 1
2715 950 115 1 3
2716 951 270 0 1
2717 951 115 1 3
2718 952 279 0 1
2719 952 114 1 3
2720 953 61 0 1
2721 953 144 1 3
2722 954 9 0 1
2723 954 30 0 2
2724 954 89 1 3
2725 955 10 0 1
2726 955 30 0 2
2727 955 89 1 3
2728 956 10 0 1
2729 956 30 0 2
2730 956 89 1 3
2731 957 277 0 1
2732 957 10 0 2
2733 957 172 1 3
2734 958 277 0 1
2735 958 10 0 2
2736 958 172 1 3
2737 959 145 0 1
2738 959 51 0 2
2739 959 276 1 3
2740 960 22 0 1
2741 960 55 0 2
2742 960 62 1 3
2743 961 113 0 1
2744 961 77 0 2
2745 961 294 1 3
2746 962 271 0 1
2747 962 75 0 2
2748 962 144 1 3
2749 963 272 0 1
2750 963 5 0 2
2751 963 29 1 3
2752 964 272 0 1
2753 964 5 0 2
2754 964 29 1 3
2755 965 272 0 1
2756 965 5 0 2
2757 965 29 1 3
2758 966 295 0 1
2759 966 212 1 3
2760 967 295 0 1
2761 967 212 1 3
2762 968 84 0 1
2763 968 124 0 2
2764 968 158 1 3
2765 969 84 0 1
2766 969 143 0 2
2767 969 158 1 3
2768 970 20 0 1
2769 970 103 1 3
2770 971 273 0 1
2771 971 165 1 3
2772 972 22 0 1
2773 972 50 0 2
2774 972 198 1 3
2775 973 22 0 1
2776 973 275 0 2
2777 973 198 1 3
2778 974 274 0 1
2779 974 151 1 3
2780 975 274 0 1
2781 975 151 1 3
2782 976 155 0 1
2783 976 155 1 3
2784 977 283 0 1
2785 977 283 1 3
2786 978 281 0 1
2787 978 281 1 3
2788 979 281 0 1
2789 979 281 1 3
2790 981 281 0 1
2791 981 281 1 3
2792 982 281 0 1
2793 982 281 1 3
2794 983 281 0 1
2795 983 281 1 3
2796 984 281 0 1
2797 984 281 1 3
2798 985 281 0 1
2799 985 281 1 3
2800 986 282 0 1
2801 986 282 1 3
2802 988 282 0 1
2803 988 282 1 3
2804 989 282 0 1
2805 989 282 1 3
2806 990 282 0 1
2807 990 282 1 3
2808 991 282 0 1
2809 991 282 1 3
2810 992 282 0 1
2811 992 282 1 3
2812 993 282 0 1
2813 993 282 1 3
2814 994 284 0 1
2815 994 284 1 3
2816 995 285 0 1
2817 995 285 1 3
2818 996 286 0 1
2819 996 286 1 3
2820 997 287 0 1
2821 997 287 1 3
2822 998 288 0 1
2823 998 288 1 3
2824 999 289 0 1
2825 999 289 1 3
2826 1000 104 0 1
2827 1000 20 0 2
2828 1000 124 1 3
2829 1001 104 0 1
2830 1001 20 0 2
2831 1001 124 1 3
2832 1002 104 0 1
2833 1002 20 0 2
2834 1002 124 1 3
2835 1003 18 0 1
2836 1003 49 1 3
2837 1004 18 0 1
2838 1004 133 1 3
2839 1005 18 0 1
2840 1005 133 1 3
2841 1006 298 0 1
2842 1006 298 1 3
2843 1007 298 0 1
2844 1007 298 1 3
2845 1008 128 0 1
2846 1008 293 0 2
2847 1008 46 1 3
2848 1009 38 0 1
2849 1009 11 0 2
2850 1009 109 1 3
2851 1010 72 0 1
2852 1010 39 0 2
2853 1010 128 1 3
2854 10250 22 0 1
2855 10250 83 0 2
2856 10250 291 1 3
2857 10251 22 0 1
2858 10251 83 0 2
2859 10251 291 1 3
2860 10252 22 0 1
2861 10252 83 0 2
2862 10252 291 1 3
2863 10253 38 0 1
2864 10253 11 0 2
2865 10253 109 1 3
2866 10254 165 0 1
2867 10254 82 0 2
2868 10254 47 1 3
2869 10255 32 0 1
2870 10255 50 0 2
2871 10255 155 1 3
2872 10256 278 0 1
2873 10256 278 1 3
2874 10257 132 0 1
2875 10257 167 0 2
2876 10257 101 1 3
2877 10258 279 0 1
2878 10258 114 1 3
2879 10259 279 0 1
2880 10259 114 1 3
2881 10260 22 0 1
2882 10260 55 0 2
2883 10260 62 1 3
2884 10261 22 0 1
2885 10261 55 0 2
2886 10261 125 1 3
2887 10262 22 0 1
2888 10262 55 0 2
2889 10262 125 1 3
2890 10263 50 0 1
2891 10263 50 1 3
2892 10264 288 0 1
2893 10264 288 1 3
2894 10265 288 0 1
2895 10265 288 1 3
2896 10266 288 0 1
2897 10266 288 1 3
2898 10267 288 0 1
2899 10267 288 1 3
2900 10268 289 0 1
2901 10268 289 1 3
2902 10269 289 0 1
2903 10269 289 1 3
2904 10270 289 0 1
2905 10270 289 1 3
2906 10271 289 0 1
2907 10271 289 1 3

File diff suppressed because it is too large Load diff