Ellpeck/ActuallyAdditions
1
0
Fork 0
mirror of https://github.com/Ellpeck/ActuallyAdditions.git synced 2024-11-23 15:48:34 +01:00
Code Issues Projects Releases Wiki Activity
2752 commits 14 branches 4 tags 33 MiB
Commit graph

2429 commits

Author SHA1 Message Date
Michael Hillcox
674e000e2b fix: lang, stopped worldsave crashing 2021-11-21 21:21:07 +00:00
Michael Hillcox
ae22d44755 fix: rip 2021-11-21 21:04:10 +00:00
Michael Hillcox
295a46626d fix: all the issues! 2021-11-21 21:03:07 +00:00
Flanks255
654a001990 Tweaks 2021-11-21 14:45:33 -06:00
Michael Hillcox
286946e29f fix: name 2021-11-21 20:36:18 +00:00
Michael Hillcox
40f9a7ec46 fix: remaining issues 2021-11-21 20:34:08 +00:00
Flanks255
ac3551061d COMPILE 2021-11-21 14:18:00 -06:00
Flanks255
eb3072bcbe ?! 2021-11-21 14:05:27 -06:00
Michael Hillcox
b3a00f8d4e fix: rings 2021-11-21 20:02:08 +00:00
Michael Hillcox
3980b8dc46 Merge remote-tracking branch 'origin/1.16' into 1.16 2021-11-21 19:57:32 +00:00
Michael Hillcox
5236744941 fix: yeet solar furnace? 2021-11-21 19:57:27 +00:00
Flanks255
b6406c7adc Under 100. 2021-11-21 13:49:33 -06:00
Michael Hillcox
4273fdd0f5 fix: yeet method handler methods for booklet until the booklet is added back 2021-11-21 18:33:57 +00:00
Flanks255
eccf77dd54 something something crusher screen is done i think... 2021-11-21 11:36:46 -06:00
Flanks255
01ee39973a So many errors.... 2021-11-21 10:57:50 -06:00
Flanks255
4b57b9fb45 So many errors... 2021-11-21 10:31:57 -06:00
Flanks255
789570e25d Whittling away at configs... part 1. 2021-11-14 12:18:07 -06:00
Flanks255
d3780c5011 So much porting... 2021-11-13 17:20:29 -06:00
Flanks255
a6b359e1a7 Merge remote-tracking branch 'origin/1.16' into 1.16 2021-11-13 13:30:11 -06:00
Flanks255
97e6b9c0db Datagenned paxels / equipment. 
added Netherite paxel.
 2021-11-13 13:29:59 -06:00
Michael Hillcox
d922cbdc9e feat: hmm, more porting 2021-11-13 19:09:55 +00:00
Michael Hillcox
05d64c1539 Merge remote-tracking branch 'origin/1.16' into 1.16 2021-11-13 18:31:28 +00:00
Michael Hillcox
f19fa61229 fix: finished util classes and removed booklet 2021-11-13 18:30:58 +00:00
Flanks255
7089cda9af More cleanup.... 2021-11-13 11:16:25 -06:00
Flanks255
9b93760445 More cleanup... 2021-11-13 11:02:42 -06:00
Flanks255
a0b8a83194 Some more recipe work, crushing recipe might be done? 2021-11-13 10:30:53 -06:00
Flanks255
9b11bf3245 Crushy McCrushRecipeFace 2021-10-24 11:49:48 -05:00
Flanks255
93fdf5a674 Some fluid stuff maybe... 2021-10-24 11:03:33 -05:00
Flanks255
8c1da19930 Misc stuff 2021-10-23 13:17:04 -05:00
Flanks255
f3c30d547d more fixes... 2021-10-21 12:33:19 -05:00
Flanks255
f4c7ea0605 more errors, missed a few 2021-10-17 14:52:49 -05:00
Flanks255
e0c049f900 more errors. 2021-10-17 14:46:26 -05:00
Flanks255
08112ea11c Derp derp 2021-10-16 12:09:59 -05:00
Flanks255
cd37abb4ca Network done for now? 2021-10-16 11:46:41 -05:00
Flanks255
3da868fc29 Some low hanging network fruit. 2021-10-16 08:35:52 -05:00
Flanks255
2a6126a1df Should be all of the empowering recipes. 2021-10-14 14:15:16 -05:00
Flanks255
f105b4c265 Empowering recipe is done, datagen next. 2021-10-13 18:54:14 -05:00
Flanks255
6d1aec9d2e Finished converting the main laser recipes to datagen. 2021-10-13 15:42:48 -05:00
Flanks255
b907f08847 Whoops 2021-10-13 11:47:29 -05:00
Flanks255
26343b77c1 Implemented LaserRecipe... Hopefully... 2021-10-12 22:08:31 -05:00
Flanks255
a881b81237 Missed something. 2021-10-12 21:50:44 -05:00
Flanks255
4b76440fce Fixed recipe class name to more align with previous class. 2021-10-12 16:44:02 -05:00
Flanks255
0e31e1e19f Finished Battery recipes. 2021-10-12 16:26:43 -05:00
Flanks255
984b21632d Added NBT Copying recipe type. 2021-10-12 16:19:47 -05:00
Flanks255
0b61cc082d More recipes done, part 3. 2021-10-06 17:18:02 -05:00
Flanks255
5f0a5f660c Picking away at item recipes, part 2 2021-10-04 18:25:33 -05:00
Flanks255
c9e5ca7ff8 Item Recipe conversion, round 1. 2021-10-02 11:49:11 -05:00
Flanks255
a6cba0f69b Little fixes here and there... 2021-10-02 08:59:42 -05:00
Flanks255
148d05a27d fixed a mapping change error. 2021-10-01 15:59:10 -05:00
Flanks255
87bc236287 Fermenting Barrel should be done for now. 2021-09-30 16:23:56 -05:00
Flanks255
b6e4b5a8b3 Moreeeee fixes... time for bed... 2021-08-30 17:44:39 -05:00
Flanks255
218df0c857 Fixed more classes... 2021-08-30 15:51:41 -05:00
Flanks255
56ec90df99 More fixes, time to sleep... 2021-08-29 19:01:35 -05:00
Flanks255
626df0f7fa Lots of little fixes, nothing to see here... 2021-08-29 18:38:12 -05:00
Michael Hillcox
12cd168a36 fix: more issues, ported item drill upgrade 2021-08-23 11:19:49 +01:00
Michael Hillcox
cb45e86529 fix: issues with merge 2021-08-22 22:40:28 +01:00
Michael Hillcox
ab166cb0e4 Merge remote-tracking branch 'origin/1.16' into 1.16 2021-08-22 22:31:28 +01:00
Michael Hillcox
d89e3f5d1d fix: all the porting :D 2021-08-22 22:19:57 +01:00
Flanks255
db186bcadd Block Reg Refactor part 3: The End... or is it? 2021-08-22 14:33:22 -05:00
Flanks255
a97715b5ef Block Reg Refactor part 2: The Tilening... 2021-08-22 14:09:15 -05:00
Flanks255
ca3cc00b85 Oh god so many blocks... 
Block reg refactor, part 1
 2021-08-22 13:16:04 -05:00
Michael Hillcox
518ee0b4c1 feat: official mappings & updated to FG 5.1+ 2021-08-22 16:09:06 +01:00
Flanks255
11db8c8324 Merge remote-tracking branch 'origin/1.16' into 1.16 2021-08-07 08:54:58 -05:00
Flanks255
e2295894a4 A few more recipes down. 2021-05-09 16:31:24 -05:00
Michael Hillcox
79e8791223 chore: more commenting out 2021-05-09 20:58:05 +01:00
Michael Hillcox
e8b797bac3 feat: helper methods, cleanup and builder fixes 2021-05-05 18:05:24 +01:00
Michael Hillcox
a7c9655586 Merge remote-tracking branch 'origin/1.16' into 1.16 2021-05-05 17:46:10 +01:00
Michael Hillcox
8edd6de4d2 feat: added wrapper for builders in recipes 2021-05-05 17:44:52 +01:00
Flanks255
785c4b7460 Finished the quartz recipes... i think... 
Atomic Reconstructor...
 2021-05-05 11:34:43 -05:00
Flanks255
7ef9492778 Moar recipes.... 2021-05-05 11:15:25 -05:00
Flanks255
354a118a1f More Recipes. 
renamed Ethetic Quartz Blocks.
 2021-05-05 10:21:00 -05:00
Michael Hillcox
420188975e feat: port growth ring, hairball, knife, laser wrench, magnet ring 2021-05-04 18:50:50 +01:00
Michael Hillcox
c87bfb6c94 feat: ported bat wings, solidified experience, resonant rice, probe 2021-05-04 17:47:45 +01:00
Flanks255
2419a0e860 The Great-Renaming continues... 2021-05-02 11:10:21 -05:00
Flanks255
ff86e624b4 Much Renaming... 2021-05-02 10:47:50 -05:00
Flanks255
f655001bb6 Fixed MiscBlock registrations. 2021-05-02 10:14:25 -05:00
Flanks255
80488b501e Initial Block/Item Recipe generator classes. 
Recipes for Battery box / Farmer done.
 2021-05-01 17:51:36 -05:00
Flanks255
0146333e37 TeleStaff "Should" be ready... 2021-05-01 16:05:32 -05:00
Michael Hillcox
62b1859abb chore: SO MUCH PORTING! 2021-04-19 20:20:23 +01:00
Michael Hillcox
cf608e9f16 chore: minor fixes before bed 2021-03-01 20:34:05 +00:00
Michael Hillcox
996bf66a65 chore: ported hairy ball handler :wtf: 2021-03-01 20:30:45 +00:00
Michael Hillcox
86ff9fb641 chore: ported most item constructors... 2021-03-01 20:23:52 +00:00
Michael Hillcox
4919a5cbba chore: minor refactor fixes 2021-03-01 19:58:15 +00:00
Michael Hillcox
dcdac11e2b chore: ported most parts of the Gui's 2021-03-01 19:55:50 +00:00
Michael Hillcox
4dfe0e04bb chore: all blocks ported! 2021-03-01 19:14:50 +00:00
Michael Hillcox
0e4a65354f chore: some blocks ported and INamedProviders added to tiles 2021-03-01 17:46:12 +00:00
Michael Hillcox
fcb150ebaf chore: containers ported mostly, gui's ported for comparability 2021-03-01 17:11:34 +00:00
Michael Hillcox
cb650b6689 chore: utils mostly ported, misc ported, deprecation's added, specials ported mostly 2021-03-01 16:25:30 +00:00
Michael Hillcox
6f34f82f4e chore: so much block porting 2021-02-28 14:47:54 +00:00
Michael Hillcox
97bc966606 chore: a few blocks, containers, etc ported over 2021-02-28 11:33:01 +00:00
Michael Hillcox
d39cdb5de8 chore: renders ported, blocks now ActuallyBlocks, removed requested blocks 2021-02-28 10:35:10 +00:00
Michael Hillcox
d25e2fdea3 chore: gui & booklet porting 2021-02-27 21:59:18 +00:00
Michael Hillcox
a200f9aa6a chore: porting work, api package ported, micro ports here and there 2021-02-27 21:44:00 +00:00
Michael Hillcox
e0391bbf87 chore: item porting work 2021-02-27 20:24:26 +00:00
Michael Hillcox
7cd34c5360 chore: minor porting and removing files 2021-02-27 16:35:21 +00:00
Michael Hillcox
32f7a3915f chore: blocks & micro porting 2021-02-27 16:22:03 +00:00
Michael Hillcox
71ddbd9abb chore: ported over most tile entities 2021-02-27 15:33:00 +00:00
Michael Hillcox
ecb7832738 chore: moved over most tile and block register to deferred variant 2021-02-27 12:24:45 +00:00
Michael Hillcox
b7d4d600fc chore: large refactors to new mappings 2021-02-26 21:15:48 +00:00
Michael Hillcox
e0c3024400
Merge pull request #1345 from jammehcow/bugfix/1332 
Fix bounding box NPE when placing worm item
 2020-11-20 16:39:06 +00:00
Michael Hillcox
0a0dc76b88
Merge pull request #1340 from Falcion/patch-1 
Updated Russian translation.
 2020-11-20 16:38:52 +00:00
Cranky Supertoon
1726dac78f
Finish Crystal Flux Localization 
Signed-off-by: Cranky Supertoon <crankysupertoon@gmail.com>
 2020-11-15 12:12:10 -05:00
Cranky Supertoon
26650447de
Finish Crystal Flux Localization 
Signed-off-by: Cranky Supertoon <crankysupertoon@gmail.com>
 2020-11-15 12:10:12 -05:00
Ell
9a15bee50f fixed 1.12 maven publish 2020-11-07 14:38:30 +01:00
James Upjohn
2fcca318fd
Pass zero-sized bounding box to EntityWorm#setEntityBoundingBox 2020-11-07 13:11:12 +13:00
Falcion
b0083669fa
Added Russian translation. 
* Updated Actually Additions Manual (full);
* Updated some other item's, block's and etc translation;
* Moved word games, sayings (Russian-language sayings and word games) in achievements, manual;
 2020-08-25 13:55:23 +03:00
Brennan Ward
02bda56ecb Disable enchanting coffee 2019-11-09 15:02:42 -05:00
TomyLobo
c5010c5d02 Cache slot count (#1289) 
This avoids having to recalculate it every time .getSlots() is called.
The private method getItemHandlerInfos was rendered useless by this change and has been removed.

Fixed #1288
 2019-11-08 16:22:08 -05:00
iTitus
35a048de3d Add config values for Leaf & Coal Generators. Closes #1277 (#1286) 2019-11-08 12:07:11 -05:00
ThetaDev
b409090ec4 Updated german translation (#1285) 
Updated the german language file to latest version and translated everything but the manual pages.
 2019-10-13 12:02:49 -04:00
Brennan Ward
158fe22c8e Closes #1275 2019-08-29 18:51:29 -04:00
Brennan Ward
5a013dba79 Closes #1274 2019-08-29 18:48:02 -04:00
Brennan Ward
f12e83a4d0 Closes #1278 2019-08-29 18:44:13 -04:00
Shadows_of_Fire
a296419857 Closes #1269 again™️ 2019-07-25 19:11:49 -04:00
Shadows_of_Fire
4d97a943fa Closes #1266 2019-07-09 01:38:24 -04:00
Shadows_of_Fire
132b71f4a1 Closes #1269 2019-07-08 22:51:10 -04:00
Shadows_of_Fire
a0ae761660 Closes #1268 2019-07-08 22:51:05 -04:00
Shadows_of_Fire
29011db610 add a forge dep 2019-05-18 14:40:53 -04:00
Shadows_of_Fire
0b0530abaa Closes #1255 2019-05-18 14:16:27 -04:00
Shadows_of_Fire
9e2cfa2770 remove UTF8 BOM that was here somehow 2019-05-02 04:47:21 -04:00
Shadows_of_Fire
ded3877b41 rerun the formatter 2019-05-02 04:43:27 -04:00
Shadows_of_Fire
f18f148ff3 Closes #1244 2019-05-02 04:17:02 -04:00
Shadows_of_Fire
673b4bf52a Closes #1245 2019-05-02 03:54:52 -04:00
Shadows_of_Fire
474a7874ec Closes #1237 2019-05-02 03:39:05 -04:00
Shadows_of_Fire
66718437d9 Closes #1239 2019-05-02 03:32:05 -04:00
Shadows_of_Fire
785dccbed8 Merge remote-tracking branch 'origin/master' 2019-05-02 03:14:12 -04:00
Matiss
34ef9d89de Closes #1167 2019-05-02 03:13:05 -04:00
Shadows_of_Fire
274c53a014 Format so style is finally consistent. 2019-05-02 03:10:29 -04:00
Shadows_of_Fire
95a25dbfc4 Update to new forge rarity system 2019-05-02 03:08:15 -04:00
Shadows_of_Fire
1ce4d21159 Closes #1092 2019-05-02 03:08:06 -04:00
Shadows_of_Fire
a866ecac23 Closes #1194 2019-03-03 17:24:25 -05:00
Shadows_of_Fire
45cef1b4cf Closes #1210 2019-03-03 17:10:05 -05:00
shejery
bfee6a1a24 Add ko_KR.lang 2019-03-03 17:07:37 -05:00
Shadows_of_Fire
d4f98090d1 Partially address #1067 
I'll deal with the rest of them when eclipse text search works
 2019-02-27 14:51:41 -05:00
Shadows_of_Fire
a8371154ec Closes #953 2019-02-27 14:42:38 -05:00
Shadows_of_Fire
0d8f38710e Auto cleanup 2019-02-27 13:53:05 -05:00
Shadows_of_Fire
82020bcd49 refactor event registration 2019-02-27 13:44:38 -05:00
Jacob Pearson
753c1a4478 Closes Ellpeck#1225 (#1227) 2019-02-22 01:22:51 -05:00
Jacob Pearson
30b594c16b Closes Ellpeck#1230 (#1231) 
Fix solid experience dropping when doMobLoot is set to false
 2019-02-22 01:22:13 -05:00
Shadows_of_Fire
345c7a4817 Closes #1211 2019-02-06 16:15:47 -05:00
Shadows_of_Fire
9e6ae26b59 Closes #1204 2019-02-06 16:12:16 -05:00
Shadows_of_Fire
1ef95a76c9 gthub pls 2019-02-06 15:32:03 -05:00
Shadows_of_Fire
289c1de017 Closes #1222 2019-02-06 15:31:52 -05:00
Shadows_of_Fire
06ca0ad4cd Fix Filters Closes #1209 2019-02-06 15:27:38 -05:00
Shadows_of_Fire
7fe79f09be Closes #1214 2019-02-06 15:01:37 -05:00
Sir-Will
81a988811b Cache KittyVanCat UUID (#1216) 
Moved `UUID.fromString()` to a field as it currently runs it on every LivingUpdate which is unnecessary here.

![](https://i.imgur.com/BauHelP.jpg)
 2019-02-06 14:45:30 -05:00
Shadows_of_Fire
6e46026e68 r144 
also update jei deprecations
 2018-12-11 01:18:31 -05:00
Shadows_of_Fire
ebda3195bb Closes #1195 2018-10-28 13:52:26 -04:00
Shadows_of_Fire
2786022b26 Closes #1198 2018-10-28 13:38:26 -04:00
Shadows_of_Fire
e9cbf2dd85 Closes #1191 2018-10-16 19:41:40 -04:00