Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add droppers to adv redstone mech #81

Open
wants to merge 608 commits into
base: master
Choose a base branch
from
Open

Add droppers to adv redstone mech #81

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
608 commits
Select commit Hold shift + click to select a range
04d2f22
Are factory names case sensitive by chance?
GopherAtl Mar 10, 2016
4229b16
Merge pull request #193 from GopherAtl/master
Maxopoly Mar 10, 2016
69b71af
Correcting Sand Smelter factory name
ProgrammerDan Mar 13, 2016
e2d4a8c
Further work down config, ore stuff done
Maxopoly Mar 14, 2016
248590e
fix diamond shovel recipe
Mar 15, 2016
b5ad6e4
Fix shovel recipes
Mar 15, 2016
e58fbed
Fix double steak recipe & added pork recipe
Mar 15, 2016
54281e7
Merge pull request #195 from Vastitas/patch-4
Maxopoly Mar 15, 2016
eb429ac
SPADE NOT SHOVEL; DOES ANYONE EVEN USE THE ITEM TABLES OR READ MY DOCU??
Maxopoly Mar 15, 2016
a9ed1a3
Note to self: Keep Diet away from configs
Maxopoly Mar 15, 2016
25a07e7
Dynamically scale size of recipe ui window
Maxopoly Mar 16, 2016
5dae6e3
Fix recipe duration in ui and use complete stack for fuel representat…
Maxopoly Mar 16, 2016
bbea6d5
Dying and sand config stuff
Maxopoly Mar 16, 2016
c594d25
Save activator for FCC and send warn messages to dumb people
Maxopoly Mar 16, 2016
120312d
Bastion stuff
Maxopoly Mar 17, 2016
ca872d2
Bastion Factory is createable
Maxopoly Mar 17, 2016
46bb49b
Use compact ItemMap view for factory creation materials
Maxopoly Mar 17, 2016
5782081
Pylons work
Maxopoly Mar 17, 2016
b102d1d
Make biolab upgradable
Diet-Cola Mar 19, 2016
9996b6c
Merge pull request #200 from Diet-Cola/patch-6
Maxopoly Mar 19, 2016
6cc717a
Slowly working through the config
Maxopoly Mar 21, 2016
4c8fe7d
Fixes and adding pipes and sorters
Maxopoly Mar 21, 2016
a11127f
Many bug fixes
Maxopoly Mar 21, 2016
9014c67
Fix factory name tab completing and add admin command to create facto…
Maxopoly Mar 21, 2016
d9ede7d
Recheck whether pipe is complete before transferring and removing lef…
Maxopoly Mar 21, 2016
e04e8cb
Fix fuel consumption intervall for 2 factories
Maxopoly Mar 21, 2016
08c6a6c
Use compact ItemMap view in setup correctly
Maxopoly Mar 21, 2016
4851a5a
Ensure furnaces are on and changing upgrade recipe icon
Maxopoly Mar 21, 2016
0c55182
change colour of factory complete run message
Diet-Cola Mar 22, 2016
bc1190b
Changed each sendActivator colour
Diet-Cola Mar 22, 2016
e68628c
Merge pull request #203 from Diet-Cola/patch-8
Maxopoly Mar 22, 2016
2fdbda7
Add xp and pylons
Maxopoly Mar 22, 2016
8536b95
Merge branch 'master' of github.com:civcraft/factorymod
Maxopoly Mar 22, 2016
b033330
Pylons consume a reasonable amount of charcoal2
Maxopoly Mar 22, 2016
0311700
Commenting out essence cost in xp for now
Maxopoly Mar 22, 2016
34bd491
Add pylon repair recipes
Maxopoly Mar 22, 2016
3e7649a
Nether enrichment typo
Diet-Cola Mar 22, 2016
596a054
Merge pull request #205 from Diet-Cola/patch-9
Maxopoly Mar 22, 2016
ceecc13
Use output of first recipe in upgraded factory as representation
Maxopoly Mar 22, 2016
a6e0b68
Add global pylon weight to config (before anyone notices)
Maxopoly Mar 22, 2016
707dfdf
Pylon recipe changes
Diet-Cola Mar 23, 2016
19ffc09
Merge pull request #206 from Diet-Cola/patch-10
Maxopoly Mar 23, 2016
14c6010
Merge branch 'master' of github.com:civcraft/factorymod
Maxopoly Mar 23, 2016
73bb239
Amount should be 1
Maxopoly Mar 23, 2016
675b3d4
Enchanting recipes improved to be useable as upgrading enchants and u…
Maxopoly Mar 23, 2016
2264a69
Slight basic pipe & sorter balancing
Diet-Cola Mar 24, 2016
dad679a
adding crystallization factory recipe
Diet-Cola Mar 24, 2016
6880424
Update configCivcraft.yml
Diet-Cola Mar 24, 2016
2ce9266
update requirements
Diet-Cola Mar 24, 2016
030fee2
typos
Diet-Cola Mar 24, 2016
ffe324e
Add events for transferring, activating factories and executing recipes
Maxopoly Mar 25, 2016
1de6826
Updated Pylon Setup Recipes + No more Essence for XP Setup
jezzaindahouse Mar 25, 2016
86083df
Update configCivcraft.yml
jezzaindahouse Mar 25, 2016
c2ee300
Merge pull request #210 from jezzaindahouse/patch-1
Maxopoly Mar 25, 2016
afc586a
Merge pull request #209 from Diet-Cola/patch-12
Maxopoly Mar 25, 2016
98c398e
Merge pull request #208 from Diet-Cola/patch-11
Maxopoly Mar 25, 2016
139b206
Add factory to upgrade to ice factory
Maxopoly Mar 25, 2016
353e941
Added Crates
jezzaindahouse Mar 25, 2016
19bc6ba
Merge pull request #211 from jezzaindahouse/patch-2
Maxopoly Mar 25, 2016
397f5c4
Add random recipes
Maxopoly Mar 25, 2016
d7baed6
Merge branch 'master' of github.com:civcraft/factorymod
Maxopoly Mar 25, 2016
5127d6b
Added Random Flower Maker + Fixed Expert Pylon Creation
jezzaindahouse Mar 25, 2016
0451274
Slight changes to Grow Random Flower
jezzaindahouse Mar 26, 2016
2dcb264
Merge pull request #212 from jezzaindahouse/patch-3
Maxopoly Mar 26, 2016
94fae13
Added Random Sapling/Leaves Mutator + Removed Create Poppy Advanced
jezzaindahouse Mar 26, 2016
1c9c9f9
Reworked poppy creation
jezzaindahouse Mar 26, 2016
3da8598
Merge pull request #213 from jezzaindahouse/patch-4
Maxopoly Mar 26, 2016
578d757
Output unused recipes on startup
Maxopoly Mar 26, 2016
be9a796
derp
Maxopoly Mar 26, 2016
164149f
Pylons only add weight while running
Maxopoly Mar 26, 2016
4b0dcb9
Capitalised 'Compacted Item'
jezzaindahouse Mar 26, 2016
d032668
Merge pull request #214 from jezzaindahouse/patch-6
Maxopoly Mar 26, 2016
e240ced
Fix issue with unloaded chests across chunkborders
Maxopoly Mar 26, 2016
6bb9fb4
Merge branch 'master' of github.com:civcraft/factorymod
Maxopoly Mar 26, 2016
da51d3d
Fix names for pylon repair recipes
Maxopoly Mar 26, 2016
70876d4
Shift clicking chest inventory should now fit and properly build up
Maxopoly Mar 26, 2016
b02a8d2
Added Dowsing Factory + Pylon Locator Recipe
jezzaindahouse Mar 27, 2016
f5acb49
Changes
jezzaindahouse Mar 27, 2016
be093ef
Lore change so it fits
jezzaindahouse Mar 27, 2016
5916c07
Buffed upgrade cost for Dowsing Factory
jezzaindahouse Mar 27, 2016
161136b
Merge pull request #216 from jezzaindahouse/patch-7
Maxopoly Mar 27, 2016
90eb451
fix fancy stone ratios
not-nocturnal Mar 27, 2016
20cac52
Merge pull request #217 from PatchyKnowly/master
Maxopoly Mar 27, 2016
07cad37
Fix to a bunch of issues
jezzaindahouse Mar 27, 2016
dcdb306
Merge pull request #218 from jezzaindahouse/patch-8
Maxopoly Mar 27, 2016
5b923a2
Remove previously existing factory for fmc
Maxopoly Mar 27, 2016
9ac2ca9
Added Easter, Diet's Repair Changes + Expert Pylon Upgrade nerf
jezzaindahouse Mar 28, 2016
bc1b751
Shortened easter egg break time + Very rare chance of Bastion
jezzaindahouse Mar 28, 2016
e2b8be3
Merge pull request #220 from jezzaindahouse/patch-10
Maxopoly Mar 28, 2016
70431e7
woopsies
jezzaindahouse Mar 28, 2016
3530632
Merge pull request #221 from jezzaindahouse/patch-11
Maxopoly Mar 28, 2016
5e2de99
Add runnable to save factory data on a regular base
Maxopoly Mar 28, 2016
a8f9e39
Merge branch 'master' of github.com:civcraft/factorymod
Maxopoly Mar 28, 2016
e08fa0a
Dont compact entire chests at once and minor improvements
Maxopoly Mar 28, 2016
11c20c0
Made repairs easy for Civtemp + Removed break easter Egg
jezzaindahouse Apr 5, 2016
4fa6d00
Merge pull request #223 from jezzaindahouse/patch-12
Maxopoly Apr 5, 2016
6f1af09
Add repair recipe to emerald extractor
Maxopoly Apr 6, 2016
024c4ab
adding repair recipe to soup kitchen
Diet-Cola Apr 6, 2016
2aea0a9
Merge pull request #224 from Diet-Cola/patch-14
Maxopoly Apr 7, 2016
6a29949
Aether less plentiful, xp recipes more balanced, expert pylon creatio…
jezzaindahouse Apr 7, 2016
29a852d
Yay
jezzaindahouse Apr 7, 2016
f58c6c0
Yay again
jezzaindahouse Apr 7, 2016
14a33d2
Merge pull request #225 from jezzaindahouse/patch-15
Maxopoly Apr 7, 2016
d705c50
Prevent pylon recipe from crashing gui if no factories exist on the map
Maxopoly Apr 8, 2016
bc4c1ef
Prevent further repairing if factory is at full health
Maxopoly Apr 8, 2016
208c846
Merge branch 'master' of github.com:civcraft/factorymod
Maxopoly Apr 8, 2016
ddb30bb
Removed unused class
Maxopoly Apr 8, 2016
66accf1
Catch another gui NPE
Maxopoly Apr 8, 2016
7861a71
Added Enchanting + XP
jezzaindahouse Apr 8, 2016
e7a836d
Made XP Factories sound nicer (Cauldrons out/Transmuters in)
jezzaindahouse Apr 8, 2016
6ab9614
Changed 'Alchemist' to 'Grandmaster'
jezzaindahouse Apr 8, 2016
e19c4f6
Made Pylon Locator Much Cheaper
jezzaindahouse Apr 9, 2016
97930d8
Updated Grandmaster Transmuter Creation Recipe
jezzaindahouse Apr 9, 2016
df25d39
Fixed YAML, re-added Emerald Extractor (removed recipes)
jezzaindahouse Apr 9, 2016
9931c7c
Merge pull request #226 from jezzaindahouse/patch-16
Maxopoly Apr 9, 2016
5ee644f
Output missing type location during parsing
Maxopoly Apr 9, 2016
a0725f8
Readd recipe identifier
Maxopoly Apr 9, 2016
08f47f4
Fix pork identifier in config
Maxopoly Apr 9, 2016
4e7bec5
Output more information about invalid configs
Maxopoly Apr 9, 2016
d519afd
Go away tabs
jezzaindahouse Apr 9, 2016
7be26bd
Merge pull request #228 from jezzaindahouse/patch-21
Maxopoly Apr 9, 2016
76ced3a
Spaces
jezzaindahouse Apr 9, 2016
cd2ae45
Merge pull request #229 from jezzaindahouse/patch-22
Maxopoly Apr 9, 2016
d648a2d
Added Basic Forge
jezzaindahouse Apr 9, 2016
cebe539
Merge pull request #230 from jezzaindahouse/patch-23
Maxopoly Apr 9, 2016
27169f4
Fixes to Little Config Things
jezzaindahouse Apr 9, 2016
2414b04
Merge pull request #231 from jezzaindahouse/patch-24
Maxopoly Apr 9, 2016
cfc16e3
More
jezzaindahouse Apr 9, 2016
885462c
Merge pull request #232 from jezzaindahouse/patch-25
Maxopoly Apr 9, 2016
870db8e
Removed silk shears, added previous tier recipes
jezzaindahouse Apr 9, 2016
822c42b
Merge pull request #234 from jezzaindahouse/patch-28
Maxopoly Apr 9, 2016
94a707f
Fix to recipe list
jezzaindahouse Apr 9, 2016
9b74329
Merge pull request #235 from jezzaindahouse/patch-29
Maxopoly Apr 9, 2016
d73283e
Additional config parsing error messages
Maxopoly Apr 9, 2016
b546d71
Add material return recipe for emerald extractor
Maxopoly Apr 9, 2016
f181d0e
Fix few identifers
Maxopoly Apr 9, 2016
1e3062f
Temporarily removed meat cost + doubled XP outputs
jezzaindahouse Apr 10, 2016
12e4170
Merge pull request #239 from jezzaindahouse/patch-31
Maxopoly Apr 10, 2016
fccfea5
Made lower tier XP recipes available for higher-tier factories.
jezzaindahouse Apr 10, 2016
d59808f
Add enchants unsafe
Maxopoly Apr 10, 2016
421aeaa
Merge branch 'master' of github.com:civcraft/factorymod
Maxopoly Apr 10, 2016
97ceb49
Fix determ enchant recipe gui for real this time
Maxopoly Apr 10, 2016
6411913
Change enchant times from 1m to 15s
Diet-Cola Apr 11, 2016
8af059c
Merge pull request #241 from Diet-Cola/patch-17
Maxopoly Apr 11, 2016
98292d5
Slight config fixes
jezzaindahouse Apr 12, 2016
d1d1083
Merge pull request #240 from jezzaindahouse/patch-32
Maxopoly Apr 12, 2016
1a6a13f
Merge pull request #244 from jezzaindahouse/patch-33
Maxopoly Apr 12, 2016
b4efb9d
Better XP Balance and Burn Charcoal Names (#246)
jezzaindahouse Apr 13, 2016
62a6ffd
Updated Pylon Repair Recipes (#247)
jezzaindahouse Apr 13, 2016
cae9c16
Add new permission system (#243)
Maxopoly Apr 13, 2016
0c05517
MenuBuilder NPE
Apr 14, 2016
90356eb
Allow renaming factories by adding feature to convert names over on s…
Apr 17, 2016
4da74dc
Balance changes
Apr 17, 2016
9bdc5ef
Adding ability to pick which output of the RANDOM recipe should be sh…
ProgrammerDan Apr 17, 2016
3a098dc
Fix compacting dupe with items stack to 16
Apr 17, 2016
98176ce
Wrap up rebalancing of standard stuff
Apr 17, 2016
a782ec0
Allow compaction of lored items and items that stack to 1
Apr 19, 2016
d1db8c6
Correction to GM Transmuter upgrade recipe (#236)
Diet-Cola Apr 19, 2016
013dc4b
Made Dowsing Factory upgradable (#249)
Diet-Cola Apr 19, 2016
6c7e067
Added temp repair recipes to New Factories
jezzaindahouse Apr 22, 2016
ac7dfe9
Merge pull request #252 from jezzaindahouse/patch-39
ProgrammerDan Apr 22, 2016
5381a7a
Half enchanting costs
Apr 27, 2016
bbf0dd6
Half Aether requirements for XP recipes
Apr 27, 2016
57dade0
Move pylon finder in redstone factory
Apr 27, 2016
5d11114
Prot II production time fixed
Diet-Cola Apr 29, 2016
dd03935
Merge pull request #259 from Diet-Cola/patch-19
ProgrammerDan Apr 29, 2016
b324637
Doubled the materials required for XP Production (#261)
jezzaindahouse May 3, 2016
5acbd3e
Final XP Changes (#263)
jezzaindahouse May 4, 2016
a0fee28
Update plugin references in pom to latest
Maxopoly May 5, 2016
ac649ae
Adding frost walker enchant ready for 1.9 (#264)
Diet-Cola May 6, 2016
ad2f412
Added Shield Unbreaking Enchant Recipe (#265)
jezzaindahouse May 6, 2016
0fba59e
Prevent compacting of enchanted stuff
May 8, 2016
71e7e63
Merge branch 'master' of github.com:civcraft/factorymod
May 8, 2016
0600760
Update documentation
May 9, 2016
86d1b20
Actually commit everything
May 9, 2016
adfb9d4
Rework diamond equip forges
May 10, 2016
c4eed0a
Only prevent compaction of enchanted items if stacksize is 1
May 11, 2016
efe3955
Fix intendation
May 11, 2016
37cdd76
Quartered Egg Cost for Topaz Recipe (#266)
jezzaindahouse May 11, 2016
2446362
Added Fossils (#270)
jezzaindahouse May 27, 2016
6467720
Fix wrong material name
May 27, 2016
39052ee
configCivcraft.yml (#271)
Yearn0 Jun 3, 2016
099508d
Fix NPE for material return recipe
Jun 11, 2016
813d0f2
Update to 1.10
Jun 11, 2016
3da6610
Update to 1.10 (#272)
Maxopoly Jun 11, 2016
9bdfb25
Remove plugin setting for clickable inventory
Jun 12, 2016
eb1cb60
Fix conflict
Jun 12, 2016
772271a
Actually commit fixed pom
Jun 12, 2016
7c010de
Add reinforcement recipes
Jul 10, 2016
7bdcf5c
Use plural for reinforcement factory names
Jul 10, 2016
9b38b10
Add fast basic recipes
Jul 10, 2016
e95e2da
Fix quantites for basic reinforcement component recipes
Jul 10, 2016
83e75a2
Add basic reinforcement recipes (not just components) and fix some mi…
Jul 10, 2016
7cabb82
Remove unused factories while I'm on it
Jul 10, 2016
6102892
Further fixes for reinforcement recipes
Jul 13, 2016
f5db0f4
Add reinforcement recipes (#273)
Maxopoly Jul 13, 2016
9b0e774
Adding repair to all recipes, adjusting existing, matching agreed on …
ProgrammerDan Jul 14, 2016
6c0f7fd
Fix lore for reinforcement factory upgrades and remove dowsing factor…
Jul 14, 2016
754274b
Fix conflict
Jul 14, 2016
2bd103b
Merge pull request #274 from Civcraft/repair-final
ProgrammerDan Jul 20, 2016
c19e252
Fix book material for fossil output enchanted books
Jul 25, 2016
67760c1
Dynamically adjust size of recipe selection to fix issues with not al…
Jul 27, 2016
56eb514
Added Basic/Advanced Charcoal burn for Acacia/Dark Oak (#278)
jezzaindahouse Aug 4, 2016
638e8d3
Small QOL fixes
Aug 7, 2016
565fdf0
Small QOL fixes (#281)
Maxopoly Aug 7, 2016
19fae90
Merge branch 'master' of github.com:civcraft/factorymod
Aug 7, 2016
12cc6ee
Make health, damage taken per decay intervall and 0% grace period con…
Aug 7, 2016
d5fb1b3
configchanges to go along with structure changes
Aug 7, 2016
572b548
Fix lapis block amount in fossil recipe
Aug 7, 2016
e161da3
Added recipes for Beetroots (#283)
gatlinnewhouse Aug 11, 2016
4aec303
Bypass permission checks on start up so factory upgrades arent cancelled
Aug 12, 2016
48a6b30
Increment pom
Aug 12, 2016
b752b0f
Add lore enchant recipe
Aug 17, 2016
df590c4
Ensure noone cheats with tool compaction
Aug 17, 2016
40e8158
Clean up a bit
Aug 19, 2016
e4e0398
Persist recipes of a factory
Aug 19, 2016
e035ef3
Make maven a bit happier
Aug 19, 2016
fd047e5
Let player hit factory in creative
Aug 19, 2016
8e9fb8e
Fix lots of random broken shit
Aug 19, 2016
b0cf412
Reinforcement rebalance stage
ProgrammerDan Aug 19, 2016
49fb208
Balance Changes (#284)
idoash4 Aug 22, 2016
83c2a02
No longer force close inventories in gui
Aug 26, 2016
32aa68e
Fix minor issue
Aug 26, 2016
01652fc
Added alternate upgrade to wood processor (#287)
TealNerd Aug 27, 2016
4f908fd
Add inheritation for recipes
Aug 28, 2016
bfa1c02
Add Leaf shears
Aug 31, 2016
bf7076f
Make compatible with latest CivModCore and minor config fix
Aug 31, 2016
6f57f13
Final fixes to lore enchant recipe
Aug 31, 2016
d44160a
Catch inconsistency in random recipe
Sep 7, 2016
e7e079d
Add option to reduce reinforcement damage
Sep 8, 2016
f1e4d37
Apply RRC-2C
Sep 8, 2016
ec94331
Add citadelBreakReduction to all factories (#288)
idoash4 Sep 8, 2016
985a051
Fix skulls in strong hunter component
Maxopoly Sep 9, 2016
4a20471
Properly sort factory blocks when loading and make citadel thing work
Sep 9, 2016
646d7e3
Merge remote-tracking branch 'civcraft/master' into texturePack
Sep 9, 2016
68e5bbf
Add recipe scaling and upgrades
Sep 19, 2016
2bbe117
Add auto select
Sep 24, 2016
fb1d2f2
Increment version1
Sep 24, 2016
d89e7a9
Minor fixes to prevent plugin breaking NPEs
Sep 24, 2016
4267080
Endgame EXP and pylon rebalancing (#291)
FreyaFrei Sep 27, 2016
51143be
Synchronize access to factory hashset to avoid concurrentmodification…
Sep 27, 2016
1bcc0fb
Add simplified printing press (#290)
waffle-stomper Sep 28, 2016
ef1a70a
Allow cross path upgrade for third tier rein components
Sep 28, 2016
da89ff3
Half repair cost
Sep 28, 2016
8fa612e
Actually add recipes!
Sep 28, 2016
450b50e
Merge pull request #294 from Civcraft/repaircost
ProgrammerDan Sep 28, 2016
4375ec8
Merge pull request #295 from Civcraft/reinI
ProgrammerDan Sep 28, 2016
81d7922
Ensure null fccf in output representation method for prod recipe is c…
Oct 10, 2016
a779e59
Merge branch 'master' of github.com:civcraft/factorymod into civMaster
Oct 10, 2016
252cef2
Make pipe length configurable
Oct 10, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
/target/
.classpath
.settings/**
.project
1 change: 1 addition & 0 deletions CONTRIBUTING.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
<a href="https://www.clahub.com/agreements/Civcraft/FactoryMod">sign the Contributor License Agreement</a>
184 changes: 0 additions & 184 deletions Config Scripts/ConfigObjects.py
View file
Open in desktop

This file was deleted.

Loading