3024 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
DBotThePony	34a9bfd48a	Merge branch '1.19.4' into 1.19.3	2024-01-02 12:01:48 +07:00
DBotThePony	7f15ae6a3a	Merge branch '1.20.1' into 1.19.4	2024-01-02 12:01:30 +07:00
DBotThePony	edea36a8a6	Merge branch '1.20.2' into 1.20.1	2024-01-02 12:00:12 +07:00
DBotThePony	113db7fa9e	Add microwave oven block shape	2024-01-02 11:53:52 +07:00
DBotThePony	063095df10	Merge branch 'master' of https://git.dbotthepony.ru/DBot/overdrive_that_matters into master	2024-01-02 11:42:45 +07:00
DBotThePony	477f9c3a67	Re-enable JEI and Jade	2024-01-02 11:35:45 +07:00
DBotThePony	f183e2a008	Some logic fixups to creative menus	2024-01-02 11:35:15 +07:00
DBotThePony	2220a7039f	Make mod actually run	2024-01-02 11:31:41 +07:00
DBotThePony	fa67353eae	Add one more workaround for old creative tabs	2024-01-02 11:18:24 +07:00
DBotThePony	da901cee87	Make mod compile against 1.19.2	2024-01-02 11:07:50 +07:00
GearShocky	76de15f01b	Update the texture for metal beams and lamps	2024-01-02 00:15:39 +06:00
DBotThePony	c1d6f7c061	More backporting	2024-01-02 01:09:49 +07:00
DBotThePony	1fa988e5fd	More backporting	2024-01-02 01:03:09 +07:00
DBotThePony	11e66d50a4	Make main source set compile against 1.19.2	2024-01-02 00:56:27 +07:00
GearShocky	ea448c5262	More texture adjustments	2024-01-01 23:51:32 +06:00
DBotThePony	e00f79c736	More backporting	2024-01-02 00:33:01 +07:00
DBotThePony	09f4db3fa9	More backporting	2024-01-02 00:24:18 +07:00
GearShocky	355242b470	Merge remote-tracking branch 'origin/master'	2024-01-01 23:17:20 +06:00
GearShocky	ffa94d190d	Microwave	2024-01-01 23:16:59 +06:00
DBotThePony	3fc9435259	Some backporting	2024-01-01 23:45:19 +07:00
DBotThePony	d24a72d435	Downgrade dependencies	2024-01-01 23:11:41 +07:00
DBotThePony	9956aa1ba4	Merge branch '1.19.3' into 1.19.2	2024-01-01 23:06:05 +07:00
DBotThePony	036de121c7	Revert "DBot — Сегодня, в 7:53" ... This reverts commit 8abb4e1598. Revert "бакпорт изменений curios под смачный пердёж" This reverts commit 1cbf73cdfd. Revert "помогите" This reverts commit b97e18ca5f. Revert "DBotThePony — Сегодня, в 17:11" This reverts commit 0da87980f7. Revert "android health bar + 1px wider energy bar" This reverts commit cbaf89d4a7. Revert "Resolve conflicts between 1.19.3 code and 1.19.2 code" This reverts commit 006cbc75e3. Revert "Add missing import" This reverts commit 275e340243. Revert "Multi packet mattery registry sync" This reverts commit 3dcaed64cd. Revert "Increase (de)compress buffer sizes" This reverts commit 04a5e87fec. Revert "Compress matter registry packet" This reverts commit 36c14be025. Revert "Payload may not be larger than 1048576 bytes" This reverts commit 26a064fbe2.	2024-01-01 23:05:36 +07:00
DBotThePony	20469a14dd	:wine:	2024-01-01 22:53:51 +07:00
DBotThePony	8a891e6ffb	Merge branch '1.19.4' into 1.19.3	2024-01-01 22:44:09 +07:00
DBotThePony	ad76b4cabc	Fix tooltips being wrongly positioned	2024-01-01 22:41:58 +07:00
DBotThePony	9cf66e443e	Fix items being rendered with 1 pixel offset	2024-01-01 22:24:15 +07:00
DBotThePony	2506f0fe0e	Fix missed translatable contents	2024-01-01 22:17:23 +07:00
DBotThePony	2aa084290b	Make mod compile against 1.19.3	2024-01-01 22:15:32 +07:00
DBotThePony	b9f6b65900	Make main source set compile against 1.19.3	2024-01-01 22:12:39 +07:00
DBotThePony	41ce2841b1	More backporting	2024-01-01 22:04:53 +07:00
DBotThePony	a5ba27cf63	More backporting	2024-01-01 22:04:26 +07:00
DBotThePony	7b415fbce3	More backporting	2024-01-01 22:01:57 +07:00
DBotThePony	2a117a540e	More backporting	2024-01-01 21:07:43 +07:00
DBotThePony	df15bd2f69	More backporting	2024-01-01 17:55:27 +07:00
GearShocky	6bee0784d3	Texture adjustments	2024-01-01 16:42:47 +06:00
DBotThePony	3dab053420	Merge branch '1.19.4' into 1.19.3	2024-01-01 17:31:45 +07:00
DBotThePony	7258e1e4d3	Merge branch '1.20.1' into 1.19.4	2024-01-01 17:31:35 +07:00
DBotThePony	34ef50f6ee	Merge branch '1.20.2' into 1.20.1	2024-01-01 17:31:29 +07:00
DBotThePony	2cc8215cb0	Revert "Polyfill dataresult" ... This reverts commit e3df0d82e0.	2024-01-01 17:30:48 +07:00
DBotThePony	4c5c2362ce	Merge branch '1.20.2' into 1.20.1	2024-01-01 17:29:28 +07:00
DBotThePony	e3df0d82e0	Polyfill dataresult	2024-01-01 17:28:46 +07:00
DBotThePony	0a5ae54614	Some backporting	2024-01-01 17:18:57 +07:00
DBotThePony	45dd3e5c4b	Downgrade dependencies	2024-01-01 17:02:19 +07:00
DBotThePony	5ad9d49537	Merge branch '1.20.1' into 1.19.4	2024-01-01 16:51:04 +07:00
DBotThePony	54fa8a252e	Merge branch '1.20.2' into 1.20.1	2024-01-01 16:51:04 +07:00
DBotThePony	18965ccfc7	god damn it	2024-01-01 16:50:37 +07:00
DBotThePony	4e3ca82fc7	Destroy cables on piston push instead of block	2024-01-01 16:43:11 +07:00
DBotThePony	d84af00876	Merge branch '1.20.1' into 1.19.4	2024-01-01 16:41:39 +07:00
DBotThePony	a9cb2db3b4	Merge branch '1.20.2' into 1.20.1	2024-01-01 16:38:01 +07:00